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

Fix swapped enum so I don't break anything unexpected.

Browse Source
This commit is contained in:
TighMacFanatic
2013-08-18 02:07:12 -04:00
parent 9fc7c84f74
commit 7783b835f0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoicevivox.h
View File

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

2
indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
View File

@@ -7,7 +7,7 @@
<radio_group bottom_delta="-66" draw_border="false" follows="top" height="60" left_delta="20" name="ear_location" width="364"> <radio_group bottom_delta="-66" draw_border="false" follows="top" height="60" left_delta="20" name="ear_location" width="364">
<radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item> <radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item>
<radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item> <radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item>
<radio_item bottom="-51" height="16" name="2">Hear Voice Chat equally from everyone.</radio_item> <radio_item bottom="-51" height="16" name="3">Hear Voice Chat equally from everyone.</radio_item>
</radio_group> </radio_group>
<text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Push To Talk</text> <text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Push To Talk</text>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Use Push-to-Talk in toggle mode" name="push_to_talk_toggle_check" tool_tip="When enabled, press the push-to-talk trigger to switch your microphone on and off. When disabled, the microphone is off unless the trigger is being held down."/> <check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Use Push-to-Talk in toggle mode" name="push_to_talk_toggle_check" tool_tip="When enabled, press the push-to-talk trigger to switch your microphone on and off. When disabled, the microphone is off unless the trigger is being held down."/>