Skip to content

Commit 9c80f58

Browse files
committed
Fix tabs and spaces mixup and typo in llvoicevivox.
1 parent e571b9a commit 9c80f58

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

indra/newview/llvoicevivox.cpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2564,44 +2564,44 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
25642564

25652565
stream << "<ListenerPosition>";
25662566

2567-
if (mEarLocation != earLocSpeaker)
2568-
{
2569-
LLVector3d earPosition;
2570-
LLVector3 earVelocity;
2571-
LLMatrix3 earRot;
2572-
2573-
switch(mEarLocation)
2574-
{
2575-
case earLocCamera:
2576-
default:
2577-
earPosition = mCameraPosition;
2578-
earVelocity = mCameraVelocity;
2579-
earRot = mCameraRot;
2580-
break;
2581-
2582-
case earLocAvatar:
2583-
earPosition = mAvatarPosition;
2584-
earVelocity = mAvatarVelocity;
2585-
earRot = mAvatarRot;
2586-
break;
2587-
2588-
case earLocMixed:
2589-
earPosition = mAvatarPosition;
2590-
earVelocity = mAvatarVelocity;
2591-
earRot = mCameraRot;
2592-
break;
2593-
}
2594-
2595-
l = earRot.getLeftRow();
2596-
u = earRot.getUpRow();
2597-
a = earRot.getFwdRow();
2598-
pos = earPosition;
2599-
vel = earVelocity;
2567+
if (mEarLocation != earLocSpeaker)
2568+
{
2569+
LLVector3d earPosition;
2570+
LLVector3 earVelocity;
2571+
LLMatrix3 earRot;
2572+
2573+
switch(mEarLocation)
2574+
{
2575+
case earLocCamera:
2576+
default:
2577+
earPosition = mCameraPosition;
2578+
earVelocity = mCameraVelocity;
2579+
earRot = mCameraRot;
2580+
break;
2581+
2582+
case earLocAvatar:
2583+
earPosition = mAvatarPosition;
2584+
earVelocity = mAvatarVelocity;
2585+
earRot = mAvatarRot;
2586+
break;
2587+
2588+
case earLocMixed:
2589+
earPosition = mAvatarPosition;
2590+
earVelocity = mAvatarVelocity;
2591+
earRot = mCameraRot;
2592+
break;
2593+
}
2594+
2595+
l = earRot.getLeftRow();
2596+
u = earRot.getUpRow();
2597+
a = earRot.getFwdRow();
2598+
pos = earPosition;
2599+
vel = earVelocity;
26002600

26012601
// LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
26022602

2603-
oldSDKTransform(l, u, a, pos, vel);
2604-
}
2603+
oldSDKTransform(l, u, a, pos, vel);
2604+
}
26052605

26062606
stream
26072607
<< "<Position>"

indra/newview/llvoicevivox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ class LLVivoxVoiceClient : public LLSingleton<LLVivoxVoiceClient>,
787787
earLocCamera = 0, // ear at camera
788788
earLocAvatar, // ear at avatar
789789
earLocMixed, // ear at avatar location/camera direction
790-
earLocSpeaker // eat at speaker, speakers not affected by position
790+
earLocSpeaker // ear at speaker, speakers not affected by position
791791
};
792792

793793
S32 mEarLocation;

0 commit comments

Comments
 (0)