diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-24 03:00:29 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-24 03:00:29 +0100 |
| commit | 40e240fe61fe8ff989ac906969946d22a186bcf2 (patch) | |
| tree | 515763bcc9354b38a18dc8fc63af7e7569a3183b /indra/newview/llvoicevivox.cpp | |
| parent | 15c3b2c6309fa4b45376f3d62e33bfcd3ccdbfc7 (diff) | |
EXT-7138 WIP Renamed VoiceEffectEnabled debug setting to VoiceMorphingEnabled.
Hide Me->My Voice menu item when VoiceMorphing is disabled.
Removed temporary VoiceFontsAvailable debug setting.
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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); |