From 820b4ea35895ef30ed4ce89154c9f80a7717af2c Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 8 Jan 2013 12:16:51 -0500 Subject: [PATCH] Optionally, remove chatbar from local chat floater. FloaterChatBarlessRect keeps the size of this separate, for those who want to switch by mood. ShowLocalChatFloaterBar toggles this. Show local chat bar in floater entry added to Adv. Chat prefs. floater_chat_history_barless.xml added for this. --- indra/newview/app_settings/settings.xml | 27 ++++++++++++ indra/newview/ascentprefschat.cpp | 2 + indra/newview/ascentprefschat.h | 1 + indra/newview/llfloaterchat.cpp | 3 +- .../en-us/floater_chat_history_barless.xml | 42 +++++++++++++++++++ .../en-us/panel_preferences_ascent_chat.xml | 1 + 6 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1fff965bf..c1e4f02c0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -749,6 +749,17 @@ Found in Advanced->Rendering->Info Displays Value 1 + ShowLocalChatFloaterBar + + Comment + Whether or not local chat should have an input bar, requires a restart. + Persist + 1 + Type + Boolean + Value + 1 + OtherChatsTornOff Comment @@ -6114,6 +6125,22 @@ This should be as low as possible, but too low may break functionality 0 + FloaterChatBarlessRect + + Comment + Rectangle for chat history without input bar + Persist + 1 + Type + Rect + Value + + 0 + 172 + 500 + 0 + + FloaterClothingRect Comment diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index d4b8c3407..eab67ed86 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -329,6 +329,7 @@ void LLPrefsAscentChat::refreshValues() mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"); mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification"); mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"); + mShowLocalChatFloaterBar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar"); mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound"); mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat"); mEnableMUPose = gSavedSettings.getBOOL("AscentAllowMUpose"); @@ -536,6 +537,7 @@ void LLPrefsAscentChat::cancel() gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming); gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification); gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM); + gSavedSettings.setBOOL("ShowLocalChatFloaterBar", mShowLocalChatFloaterBar); gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound); gSavedSettings.setBOOL("HideNotificationsInChat", mHideNotificationsInChat); gSavedSettings.setBOOL("AscentAllowMUpose", mEnableMUPose); diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h index 03e980c3f..4bf8f7551 100644 --- a/indra/newview/ascentprefschat.h +++ b/indra/newview/ascentprefschat.h @@ -66,6 +66,7 @@ protected: BOOL mIMAnnounceIncoming; BOOL mHideTypingNotification; BOOL mShowGroupNameInChatIM; + bool mShowLocalChatFloaterBar; BOOL mPlayTypingSound; BOOL mHideNotificationsInChat; BOOL mEnableMUPose; diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index bfb4892c6..db38f8009 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -108,7 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed) mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL); // do not automatically open singleton floaters (as result of getInstance()) BOOL no_open = FALSE; - LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open); + bool show_bar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar"); + LLUICtrlFactory::getInstance()->buildFloater(this, (show_bar ? "floater_chat_history.xml" : "floater_chat_history_barless.xml"), &getFactoryMap(), no_open); childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes childSetCommitCallback("translate chat",onClickToggleTranslateChat,this); diff --git a/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml b/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml new file mode 100644 index 000000000..fd6eb9091 --- /dev/null +++ b/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml @@ -0,0 +1,42 @@ + + + Connecting to in-world Voice Chat... + Connected + Voice not available at your current location + Disconnected from in-world Voice Chat + icn_voice-localchat.tga + -- Instant message logging enabled -- + -- End of Log -- + '[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS]. + '[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS]. + Take in-world money ([CURRENCY]) from you + Act on your control inputs + Remap your control inputs + Animate your avatar + Attach to your avatar + Release ownership and become public + Link and delink from other objects + Add and remove joints with other objects + Change its permissions + Track your camera + Teleport you + Control your camera + + + + Gestures + + + +