From 33ce919ab06dce92a8340cf9e25faf85bfc01f59 Mon Sep 17 00:00:00 2001 From: Beeks Date: Sat, 18 Sep 2010 23:47:30 -0400 Subject: [PATCH] Minor fix for auto-responder stuff. Signed-off-by: Beeks --- .../app_settings/settings_per_account.xml | 124 ++++++++++++++++++ indra/newview/llviewermessage.cpp | 7 +- 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 61f8eda9a..50e3693db 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -13,6 +13,130 @@ + Responder.Settings + + Comment + New organization to the Auto-Respond settings for keeping clean + Persist + 1 + Type + LLSD + Value + + Message + This is an autoresponse! + + + AscentInstantMessageAnnounceIncoming + + Comment + Open a new IM tab when another person begins typing to you and announce that they are doing so. + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageResponse + + Comment + Auto response to instant messages + Persist + 1 + Type + String + Value + This is an autoresponse! + + AscentInstantMessageResponseAnyone + + Comment + Whether to auto-respond to anyone + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageResponseFriends + + Comment + Whether to auto-respond to non-friends + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageResponseItem + + Comment + Whether to send a item along with the autoresponse + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageResponseItemData + + Comment + UUID + Persist + 1 + Type + String + Value + + + AscentInstantMessageResponseMuted + + Comment + Whether to auto-respond to muted people + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageResponseRepeat + + Comment + Whether to keep on resending the autoresponse every line they send + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageShowOnTyping + + Comment + Whether to perform the autorespond the moment they begin to type instead of waiting for a actual message + Persist + 1 + Type + Boolean + Value + 0 + + AscentInstantMessageShowResponded + + Comment + Whether to hide IMs entirely from those you have chosen to send autoresponses + Persist + 1 + Type + Boolean + Value + 0 + AscentFriendColor diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e34678042..a05e080b2 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1477,10 +1477,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) BOOL is_linden = LLMuteList::getInstance()->isLinden(name); BOOL is_owned_by_me = FALSE; - // - //chat.mMuted = is_muted && !is_linden; - chat.mMuted = is_muted; - // + LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id); + + chat.mMuted = is_muted && !is_linden; chat.mFromID = from_id; chat.mFromName = name; chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;