From c3a38c17049c318916db0c704122d0ae7d8fddd8 Mon Sep 17 00:00:00 2001 From: TighMacFanatic Date: Tue, 17 May 2011 12:58:05 -0400 Subject: [PATCH] Settings names unbotch. --- indra/newview/ascentprefschat.cpp | 4 ++-- indra/newview/ascentprefssys.cpp | 4 ++-- indra/newview/llhudeffectlookat.cpp | 4 ++-- indra/newview/llimpanel.cpp | 2 +- indra/newview/llviewermenu.cpp | 16 ++++++++-------- .../xui/en-us/panel_preferences_ascent_chat.xml | 2 +- .../en-us/panel_preferences_ascent_system.xml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index 58502b83f..cdc07611a 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -130,7 +130,7 @@ void LLPrefsAscentChat::refreshValues() //Chat/IM ----------------------------------------------------------------------------- mWoLfVerticalIMTabs = gSavedSettings.getBOOL("WoLfVerticalIMTabs"); mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"); - mHideTypingNotification = gSavedSettings.getBOOL("HideTypingNotification"); + mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification"); mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"); mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound"); mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat"); @@ -304,7 +304,7 @@ void LLPrefsAscentChat::cancel() //Chat/IM ----------------------------------------------------------------------------- gSavedSettings.setBOOL("WoLfVerticalIMTabs", mWoLfVerticalIMTabs); gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming); - gSavedSettings.setBOOL("HideTypingNotification", mHideTypingNotification); + gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification); gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM); gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound); gSavedSettings.setBOOL("HideNotificationsInChat", mHideNotificationsInChat); diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index 9ddb1d6e0..726508558 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/indra/newview/ascentprefssys.cpp @@ -136,7 +136,7 @@ void LLPrefsAscentSys::refreshValues() mBroadcastViewerEffects = gSavedSettings.getBOOL("BroadcastViewerEffects"); mDisablePointAtAndBeam = gSavedSettings.getBOOL("DisablePointAtAndBeam"); mPrivateLookAt = gSavedSettings.getBOOL("PrivateLookAt"); - mShowLookAt = gSavedSettings.getBOOL("ShowLookAt"); + mShowLookAt = gSavedSettings.getBOOL("AscentShowLookAt"); mRevokePermsOnStandUp = gSavedSettings.getBOOL("RevokePermsOnStandUp"); mDisableClickSit = gSavedSettings.getBOOL("DisableClickSit"); mDisplayScriptJumps = gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps"); @@ -195,7 +195,7 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setBOOL("BroadcastViewerEffects", mBroadcastViewerEffects); gSavedSettings.setBOOL("DisablePointAtAndBeam", mDisablePointAtAndBeam); gSavedSettings.setBOOL("PrivateLookAt", mPrivateLookAt); - gSavedSettings.setBOOL("ShowLookAt", mShowLookAt); + gSavedSettings.setBOOL("AscentShowLookAt", mShowLookAt); gSavedSettings.setBOOL("RevokePermsOnStandUp", mRevokePermsOnStandUp); gSavedSettings.setBOOL("DisableClickSit", mDisableClickSit); gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps); diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index 9be53c026..82adf1bca 100644 --- a/indra/newview/llhudeffectlookat.cpp +++ b/indra/newview/llhudeffectlookat.cpp @@ -503,7 +503,7 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp) void LLHUDEffectLookAt::render() { static const LLCachedControl private_look_at("PrivateLookAt",false); - static const LLCachedControl show_look_at("ShowLookAt",false); + static const LLCachedControl show_look_at("AscentShowLookAt", false); if (private_look_at && (gAgent.getAvatarObject() == ((LLVOAvatar*)(LLViewerObject*)mSourceObject))) return; @@ -569,7 +569,7 @@ void LLHUDEffectLookAt::render() //----------------------------------------------------------------------------- void LLHUDEffectLookAt::update() { - static const LLCachedControl show_look_at("ShowLookAt",false); + static const LLCachedControl show_look_at("AscentShowLookAt", false); // If the target object is dead, set the target object to NULL if (!mTargetObject.isNull() && mTargetObject->isDead()) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index e2c4bb676..cef6f9daa 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -2388,7 +2388,7 @@ void LLFloaterIMPanel::setTyping(BOOL typing) void LLFloaterIMPanel::sendTypingState(BOOL typing) { - if(gSavedSettings.getBOOL("HideTypingNotification")) + if(gSavedSettings.getBOOL("AscentHideTypingNotification")) return; // Don't want to send typing indicators to multiple people, potentially too // much network traffic. Only send in person-to-person IMs. diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index e02982f23..1ca128d19 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1598,7 +1598,7 @@ void init_debug_avatar_menu(LLMenuGL* menu) menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL)); LLMenuItemCheckGL* item; - item = new LLMenuItemCheckGL("Show Look At", menu_toggle_control, NULL, menu_check_control, (void*)"ShowLookAt"); + item = new LLMenuItemCheckGL("Show Look At", menu_toggle_control, NULL, menu_check_control, (void*)"AscentShowLookAt"); menu->append(item); menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt)); @@ -3736,19 +3736,19 @@ void handle_fake_away_status(void*) void handle_hide_typing_notification(void*) { - if (!gSavedSettings.controlExists("HideTypingNotification")) - gSavedSettings.declareBOOL("HideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging."); + if (!gSavedSettings.controlExists("AscentHideTypingNotification")) + gSavedSettings.declareBOOL("AscentHideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging."); - BOOL hide = gSavedSettings.getBOOL("HideTypingNotification"); + BOOL hide = gSavedSettings.getBOOL("AscentHideTypingNotification"); if (hide) { - gSavedSettings.declareBOOL("HideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging."); - gSavedSettings.setBOOL("HideTypingNotification", FALSE); + gSavedSettings.declareBOOL("AscentHideTypingNotification", FALSE, "Hide your 'Name is typing...' message when Instant Messaging."); + gSavedSettings.setBOOL("AscentHideTypingNotification", FALSE); } else { - gSavedSettings.declareBOOL("HideTypingNotification", TRUE, "Hide your 'Name is typing...' message when Instant Messaging."); - gSavedSettings.setBOOL("HideTypingNotification", TRUE); + gSavedSettings.declareBOOL("AscentHideTypingNotification", TRUE, "Hide your 'Name is typing...' message when Instant Messaging."); + gSavedSettings.setBOOL("AscentHideTypingNotification", TRUE); } LLChat chat; diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml index 0b0fc9196..f75a79267 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml @@ -23,7 +23,7 @@ IMs: control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270" name="quickstart_im_check" tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/> - -