Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings names unbotch.

Browse Source
This commit is contained in:
TighMacFanatic
2011-05-17 12:58:05 -04:00
parent 2b412bffec
commit c3a38c1704
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/ascentprefschat.cpp
View File

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

4
indra/newview/ascentprefssys.cpp
View File

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

4
indra/newview/llhudeffectlookat.cpp
View File

@@ -503,7 +503,7 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
void LLHUDEffectLookAt::render()
{
static const LLCachedControl<bool> private_look_at("PrivateLookAt",false);
static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
static const LLCachedControl<bool> 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<bool> show_look_at("ShowLookAt",false);
static const LLCachedControl<bool> show_look_at("AscentShowLookAt", false);
// If the target object is dead, set the target object to NULL
if (!mTargetObject.isNull() && mTargetObject->isDead())

2
indra/newview/llimpanel.cpp
View File

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

16
indra/newview/llviewermenu.cpp
View File

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

2
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -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. "/>
<check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
<check_box bottom_delta="-20" control_name="AscentHideTypingNotification" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Don't send '[name] is typing...' in IMs" left="10"
tool_tip="IM partners will not see '______ is typing...' when you're responding."

2
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -261,7 +261,7 @@ Teleport to avatar (usage: cmd name)
tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
mouse_opaque="true" name="private_look_at_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="ShowLookAt" enabled="true"
<check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show others' LookAt beacons" left="10"
tool_tip="Shows you where others are looking."