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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2011-06-14 16:02:43 +02:00
parent e42277a2c2 42f60042eb
commit a8d71f2550
51 changed files with 2410 additions and 1968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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);
@@ -3024,6 +3024,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
LLViewerObject* chatter;
msg->getString("ChatData", "FromName", from_name);
if (from_name.empty())
{
from_name = "(no name)";
}
chat.mFromName = from_name;
msg->getUUID("ChatData", "SourceID", from_id);
@@ -5244,6 +5248,10 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
args["MESSAGE"] = desc;
LLNotifications::instance().add("SystemMessage", args);
// Also send notification to chat -- MC
LLChat chat(desc);
LLFloaterChat::addChat(desc);
// Once the 'recent' container gets large enough, chop some
// off the beginning.
const U32 MAX_LOOKBACK = 30;