Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tabs and spaces mixup and typo in llvoicevivox.

Browse Source
This commit is contained in:
Inusaito Sayori
2013-08-27 23:27:09 -04:00
parent e571b9a585
commit 9c80f58d34
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
indra/newview/llvoicevivox.cpp
View File

@@ -2564,44 +2564,44 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
stream << "<ListenerPosition>"; stream << "<ListenerPosition>";
if (mEarLocation != earLocSpeaker) if (mEarLocation != earLocSpeaker)
{ {
LLVector3d earPosition; LLVector3d earPosition;
LLVector3 earVelocity; LLVector3 earVelocity;
LLMatrix3 earRot; LLMatrix3 earRot;
switch(mEarLocation) switch(mEarLocation)
{ {
case earLocCamera: case earLocCamera:
default: default:
earPosition = mCameraPosition; earPosition = mCameraPosition;
earVelocity = mCameraVelocity; earVelocity = mCameraVelocity;
earRot = mCameraRot; earRot = mCameraRot;
break; break;
case earLocAvatar: case earLocAvatar:
earPosition = mAvatarPosition; earPosition = mAvatarPosition;
earVelocity = mAvatarVelocity; earVelocity = mAvatarVelocity;
earRot = mAvatarRot; earRot = mAvatarRot;
break; break;
case earLocMixed: case earLocMixed:
earPosition = mAvatarPosition; earPosition = mAvatarPosition;
earVelocity = mAvatarVelocity; earVelocity = mAvatarVelocity;
earRot = mCameraRot; earRot = mCameraRot;
break; break;
} }
l = earRot.getLeftRow(); l = earRot.getLeftRow();
u = earRot.getUpRow(); u = earRot.getUpRow();
a = earRot.getFwdRow(); a = earRot.getFwdRow();
pos = earPosition; pos = earPosition;
vel = earVelocity; vel = earVelocity;
// LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL; // LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
oldSDKTransform(l, u, a, pos, vel); oldSDKTransform(l, u, a, pos, vel);
} }
stream stream
<< "<Position>" << "<Position>"

2
indra/newview/llvoicevivox.h
View File

@@ -787,7 +787,7 @@ private:
earLocCamera = 0, // ear at camera earLocCamera = 0, // ear at camera
earLocAvatar, // ear at avatar earLocAvatar, // ear at avatar
earLocMixed, // ear at avatar location/camera direction earLocMixed, // ear at avatar location/camera direction
earLocSpeaker // eat at speaker, speakers not affected by position earLocSpeaker // ear at speaker, speakers not affected by position
}; };
S32 mEarLocation; S32 mEarLocation;