livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made changes to setting names and in pannel_preferences_chat.xml for better understanding 

as per Esbee's comments in STORM-255
meow-7.2.2
Wolfpup Lowenhar 2010-10-27 11:00:39 -04:00
parent ce34ba1b89
commit 379f9b8240
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2567,10 +2567,10 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupToast</key>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>
<string>Enable Incoming Group Toasts</string>
<string>Enable Incoming Group Chat Popups</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -2578,10 +2578,10 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableIMToast</key>
<key>EnableIMChatPopups</key>
<map>
<key>Comment</key>
<string>Enable Incoming IM Toasts</string>
<string>Enable Incoming IM Chat Popups</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

4
indra/newview/llimview.cpp
View File

@ -134,12 +134,12 @@ void toast_callback(const LLSD& msg){
// *NOTE Skip toasting if the user disable it in preferences/debug settings ~Alexandrea
LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(
msg["session_id"]);
if (!gSavedSettings.getBOOL("EnableGroupToast")
if (!gSavedSettings.getBOOL("EnableGroupChatPopups")
&& session->isGroupSessionType())
{
return;
}
if (!gSavedSettings.getBOOL("EnableIMToast")
if (!gSavedSettings.getBOOL("EnableIMChatPopups")
&& !session->isGroupSessionType())
{
return;

14
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -394,12 +394,12 @@
left="280"
height="10"
width="180">
Enable Incoming Messages:
Enable Incoming Chat popups:
</text>
<check_box
control_name="EnableGroupToast"
name="EnableGroupToast"
label="Group chats"
control_name="EnableGroupChatPopups"
name="EnableGroupChatPopups"
label="Group Chats"
layout="topleft"
top_delta="18"
left="295"
@ -407,9 +407,9 @@
tool_tip="Checking this will turn on Group Messages popping up"
width="400" />
<check_box
control_name="EnableIMToast"
name="EnableIMToast"
label="IM chats"
control_name="EnableIMChatPopups"
name="EnableIMChatPopups"
label="IM Chats"
layout="topleft"
top_delta="22"
left="295"