diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 25 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 3 |
5 files changed, 12 insertions, 23 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cb9177587f..ac289a4fc2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10584,21 +10584,21 @@ <key>Value</key> <integer>0</integer> </map> - <key>VoiceFontsAvailable</key> + <key>VoiceEffectExpiryWarningTime</key> <map> <key>Comment</key> - <string>Temporary debug setting to test UI with no voice effects available.</string> + <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> - <string>Boolean</string> + <string>F32</string> <key>Value</key> - <integer>1</integer> + <real>259200.0</real> </map> - <key>VoiceEffectEnabled</key> + <key>VoiceMorphingEnabled</key> <map> <key>Comment</key> - <string>Whether or not to use Voice Effects and show the UI.</string> + <string>Whether or not to enable Voice Effects and show the UI.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -10606,17 +10606,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>VoiceEffectExpiryWarningTime</key> - <map> - <key>Comment</key> - <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>259200.0</real> - </map> <key>AutoDisengageMic</key> <map> <key>Comment</key> diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index d44b47707e..3a51f51c52 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -115,7 +115,7 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv LLVoiceClient::LLVoiceClient() : mVoiceModule(NULL), - mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceEffectEnabled")), + mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled")), mVoiceEffectDefault(LLCachedControl<std::string>(gSavedPerAccountSettings, "VoiceEffectDefault")) { } diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index d786b4d928..240d7ff164 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -1322,8 +1322,7 @@ void LLVivoxVoiceClient::stateMachine() notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_LOGGED_IN); - // *FIX: Remove VoiceFontsAvailable temporary setting (only used to test UI behaviour with no fonts) - if (LLVoiceClient::instance().getVoiceEffectEnabled() && gSavedSettings.getBOOL("VoiceFontsAvailable")) + if (LLVoiceClient::instance().getVoiceEffectEnabled()) { // request the set of available voice fonts setState(stateVoiceFontsWait); diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index 216766c3a6..0569b4d515 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -99,7 +99,7 @@ <panel class="panel_voice_effect" name="panel_voice_effect" - visiblity_control="VoiceEffectEnabled" + visiblity_control="VoiceMorphingEnabled" filename="panel_voice_effect.xml" /> <layout_panel auto_resize="false" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 5425c545e0..96885bf134 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -82,7 +82,8 @@ </menu_item_check> <menu_item_check label="My Voice" - name="ShowVoice"> + name="ShowVoice" + visibility_control="VoiceMorphingEnabled"> <menu_item_check.on_check function="Floater.Visible" parameter="voice_effect" /> |