correct the currentBufferPosition for injector packets as well
Merge pull request #459 from birarda/master

fix a crash in the avatar-mixer
new floor
coding standard cleanup
coding standard cleanup
Merge pull request #460 from ZappoMan/disco

new floor
testing avatar touch
Merge remote-tracking branch 'upstream/master'