livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7138 WIP Renamed VoiceEffectEnabled debug setting to VoiceMorphingEnabled. 

Hide Me->My Voice menu item when VoiceMorphing is disabled.
Removed temporary VoiceFontsAvailable debug setting.
meow-7.2.2
Aimee Linden 2010-05-24 03:00:29 +01:00
parent 15c3b2c630
commit 40e240fe61
5 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/app_settings/settings.xml
View File

@ -10584,28 +10584,6 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>VoiceFontsAvailable</key>
<map>
<key>Comment</key>
<string>Temporary debug setting to test UI with no voice effects available.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>VoiceEffectEnabled</key>
<map>
<key>Comment</key>
<string>Whether or not to use Voice Effects and show the UI.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>VoiceEffectExpiryWarningTime</key>
<map>
<key>Comment</key>
@ -10617,6 +10595,17 @@
<key>Value</key>
<real>259200.0</real>
</map>
<key>VoiceMorphingEnabled</key>
<map>
<key>Comment</key>
<string>Whether or not to enable Voice Effects and show the UI.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AutoDisengageMic</key>
<map>
<key>Comment</key>

2
indra/newview/llvoiceclient.cpp
View File

@ -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"))
{
}

3
indra/newview/llvoicevivox.cpp
View File

@ -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);

2
indra/newview/skins/default/xui/en/floater_voice_controls.xml
View File

@ -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"

3
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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" />