diff options
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3a80579c7f..1cb4b15147 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10416,17 +10416,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>VoiceFontDefault</key> - <map> - <key>Comment</key> - <string>Selected voice font</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>00000000-0000-0000-0000-000000000000</string> - </map> <key>VoiceFontUI</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 3ce32a05b0..1855bb0c0c 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -99,6 +99,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>VoiceFontDefault</key> + <map> + <key>Comment</key> + <string>Selected voice font</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>00000000-0000-0000-0000-000000000000</string> + </map> <!-- Settings below are for back compatibility only. They are not used in current viewer anymore. But they can't be removed to avoid diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 657a130c27..497f1db44d 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -6641,7 +6641,7 @@ LLVoiceClient::sessionState::sessionState() : mMuteDirty(false), mParticipantsChanged(false) { - mVoiceFontID = LLUUID(gSavedSettings.getString("VoiceFontDefault")); + mVoiceFontID = LLUUID(gSavedPerAccountSettings.getString("VoiceFontDefault")); } LLVoiceClient::sessionState::~sessionState() @@ -7279,7 +7279,7 @@ bool LLVoiceClient::setVoiceFont(const std::string &session_handle, const LLUUID mAudioSession->mVoiceFontID = id; // *TODO: Separate voice font defaults for spatial chat and IM? - gSavedSettings.setString("VoiceFontDefault", id.asString()); + gSavedPerAccountSettings.setString("VoiceFontDefault", id.asString()); sessionSetVoiceFontSendMessage(session); notifyVoiceFontObservers(); |