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

Option to Disallow communicate shortcut opening detached friends list

Browse Source 
Added CommunicateSpecificShortcut
Added checkbox to Text Chat preferences
This commit is contained in:
Lirusaito
2013-01-08 13:48:18 -05:00
parent 820b4ea358
commit 68911876b9
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@@ -782,6 +782,17 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>CommunicateSpecificShortcut</key>
<map>
<key>Comment</key>
<string>When true, the keyboard shortcut for Communicate will not bring up the torn off Friends List.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MarketImporterUpdateFreq</key>
<map>
<key>Comment</key>

4
indra/newview/llprefschat.cpp
View File

@@ -66,6 +66,7 @@ private:
LLColor4 mHTMLLinkColor;
BOOL mChatFullWidth;
BOOL mCloseChatOnReturn;
bool mOnlyComm;
BOOL mArrowKeysMoveAvatar;
BOOL mShowTimestamps;
BOOL mPlayTypingAnim;
@@ -111,6 +112,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
childSetValue("translate_language_combobox", gSavedSettings.getString("TranslateLanguage"));
childSetValue("translate_chat", gSavedSettings.getBOOL("TranslateChat"));
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
}
void LLPrefsChatImpl::refreshValues()
@@ -139,6 +141,7 @@ void LLPrefsChatImpl::refreshValues()
mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
}
void LLPrefsChatImpl::cancel()
@@ -166,6 +169,7 @@ void LLPrefsChatImpl::cancel()
gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);
gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);
gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
}
void LLPrefsChatImpl::apply()

3
indra/newview/llviewermenu.cpp
View File

@@ -2062,7 +2062,8 @@ class LLViewCommunicate : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
static LLCachedControl<bool> only_comm("CommunicateSpecificShortcut");
if (!only_comm && LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
{
LLFloaterMyFriends::toggleInstance();
}

3
indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
View File

@@ -24,8 +24,9 @@
<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
<text bottom_delta="-22" height="10" left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
<text bottom_delta="-12" height="10" left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
<check_box bottom_delta="-8" follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" left="148" control_name="CommunicateSpecificShortcut" name="only_comm"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>