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

Merge branch 'PrefsUpdate'

Browse Source
This commit is contained in:
TighMacFanatic
2011-05-29 20:23:59 -04:00
parent abf5f09a46 3813ccb15a
commit b7a697bcf9
23 changed files with 2092 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermessage.cpp
View File

@@ -1746,7 +1746,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
bool typing_init = false;
if( dialog == IM_TYPING_START && !is_muted )
{
if(!gIMMgr->hasSession(computed_session_id) && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
if(!gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
{
typing_init = true;
gIMMgr->addMessage(
@@ -1800,7 +1800,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// [/RLVa:KB]
{
if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) ||
(dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
(dialog == IM_TYPING_START && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
)
{
BOOL has = gIMMgr->hasSession(computed_session_id);