summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index d8bf781ce0..6bc1f42399 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)