From 8aac4348021434ec33e9d8d301310fd7b65f6827 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 12 May 2010 02:26:43 +0100
Subject: [PATCH] EXT-7138 WIP Added temporary debug setting
"VoiceFontsAvailable", to test UI when no voice fonts are available.
---
indra/newview/app_settings/settings.xml | 11 +++++++++++
indra/newview/llvoiceclient.cpp | 10 +++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e703bd770fb..eb07f099b9b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10484,6 +10484,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>VoiceFontsAvailable</key>
+ <map>
+ <key>Comment</key>
+ <string>Temporary debug setting to test UI with no fonts available</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>VoiceFontUI</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index d8bf781ce0d..6bc1f423994 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -2318,7 +2318,15 @@ void LLVoiceClient::stateMachine()
// request the set of available voice fonts
setState(stateVoiceFontsWait);
- accountGetSessionFontsSendMessage();
+ // *FIX: Remove this temporary setting, used to test UI without fonts
+ if (gSavedSettings.getBOOL("VoiceFontsAvailable"))
+ {
+ accountGetSessionFontsSendMessage();
+ }
+ else
+ {
+ setState(stateVoiceFontsReceived);
+ }
accountGetTemplateFontsSendMessage(); // *TODO: Maybe better to do this when opening preview rather than on login
// request the current set of block rules (we'll need them when updating the friends list)
--
GitLab