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

Minor fix for auto-responder stuff.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-18 23:47:30 -04:00
parent 92f0a1c9b1
commit 33ce919ab0
2 changed files with 127 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
indra/newview/app_settings/settings_per_account.xml
View File

@@ -13,6 +13,130 @@
<string /> <string />
</array> </array>
</map> </map>
<key>Responder.Settings</key>
<map>
<key>Comment</key>
<string>New organization to the Auto-Respond settings for keeping clean</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>LLSD</string>
<key>Value</key>
<map>
<key>Message</key>
<string>This is an autoresponse!</string>
</map>
</map>
<key>AscentInstantMessageAnnounceIncoming</key>
<map>
<key>Comment</key>
<string>Open a new IM tab when another person begins typing to you and announce that they are doing so.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>AscentInstantMessageResponseAnyone</key>
<map>
<key>Comment</key>
<string>Whether to auto-respond to anyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageResponseFriends</key>
<map>
<key>Comment</key>
<string>Whether to auto-respond to non-friends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageResponseItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with the autoresponse</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageResponseItemData</key>
<map>
<key>Comment</key>
<string>UUID</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>AscentInstantMessageResponseMuted</key>
<map>
<key>Comment</key>
<string>Whether to auto-respond to muted people</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageResponseRepeat</key>
<map>
<key>Comment</key>
<string>Whether to keep on resending the autoresponse every line they send</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageShowOnTyping</key>
<map>
<key>Comment</key>
<string>Whether to perform the autorespond the moment they begin to type instead of waiting for a actual message</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentInstantMessageShowResponded</key>
<map>
<key>Comment</key>
<string>Whether to hide IMs entirely from those you have chosen to send autoresponses</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<!-- Ascent Account-Specific (If active) --> <!-- Ascent Account-Specific (If active) -->
<key>AscentFriendColor</key> <key>AscentFriendColor</key>
<map> <map>

7
indra/newview/llviewermessage.cpp
View File

@@ -1477,10 +1477,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
BOOL is_linden = LLMuteList::getInstance()->isLinden(name); BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
BOOL is_owned_by_me = FALSE; BOOL is_owned_by_me = FALSE;
// <edit> LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
//chat.mMuted = is_muted && !is_linden;
chat.mMuted = is_muted; chat.mMuted = is_muted && !is_linden;
// </edit>
chat.mFromID = from_id; chat.mFromID = from_id;
chat.mFromName = name; chat.mFromName = name;
chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT; chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;