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

Chat Frosting

Browse Source 
Basic Summary:
Issue 743: [Chat UI] Option to italicize actions (/me) in chat
- Adds debug LiruItalicizeActions, and a checkbox to Adv. Chat->Chat UI preferences
Issue 737: [Frosting] Annoyance Removal (Red beacon after teleport using LM's)
- Adds debug ClearBeaconAfterTeleport, checkbox under System->General
Issue 639: [Frosting] The agent isn't identified properly in chat
- Oh what a silly issue this was, it's as though whoever wrote this didn't care.
Fixes issue where names in logs do not match names in chat due to display name system
Fixes the issue in which Unnamed objects got named by a hardcoded string under certain circumstances.
Issue 813: [Frosting] When only accepting from friends, do not display incoming chat notification for nonfriends
- Also broke the setting out, separating it from the voice calls friend only setting
- Adds InstantMessagesFriendsOnly debug setting and checkbox in Adv. Chat->Chat/IM
Issue 764: Copy SLURL from Map returns correct region but wrong coordinates.
Satisfied the longstanding issue of inflexible autoresponse options.
- Autoresponse now has its own tab in Adv. Chat preferences: Busy, Muted, nonfriends, and anyone (or just friends) can have separate responses, along with items of your choosing.
- Prevent doubling up with the first repeated autoresponse due to typing message and normal message.

Translator Summary:
Adv. Chat->Chat UI->"Italicize action messages (/me)"
System->General->"Clear red destination beacon after teleporting"
Drop Targets for floater_ao.xml, panel_avatar.xml, panel_group_notices.xml, and panel_preferences_ascent_system.xml
Adv. Chat->Chat/IM->"Only accept IMs from Friends"
Please clean up the Busy Mode Response elements from panel_preferences_im.xml
strings.xml now has "IM_autoresponse_minutes"
Adv. Chat (panel_preferences_ascent_chat.xml) now has a new panel "Autoresponse", please clean up the old Autoresponse elements from Chat/IM tab and translate this panel.

Developer Summary:
Adds EChatStyle to LLChat, used for identifying what style a piece of chat is.
Update settings_per_account.xml
- Reorganized the ascent specific section.
- Removes a few old and unused settings
Better organize settings_per_account_ascent.xml
- TODO: Actually get this include system working and remove the Ascent specific section in settings_per_account.xml
Modernize LLDropTarget and make it more flexible and stand alone
- The Text of drop targets is now a child of the target itself, meaning the necessity of having a static instance to the parent is eliminated
- Drop targets are now one element in UI XML.
- Drop targets now have fill_parent option which allows the target to spread over the parent, while the text, tool_tip, and border stays in place
- If Drop Targets have a control_name, it is from the per account settings group, since Items must be in the inventory of the account in question.
- All drop targets now use the common LLDropTarget class instead of their own.
- LLGroupDropTarget is now derived from LLDropTarget and has its own tag group_drop_target.
Cleaned up the focus functions we use to focus the input bar, setInputFocus exists for their purpose.
Updated our llim* code to line up better with upstream and conform to styling.
Polished LLTracker and LLFloaterWorldMap a bit
Cleaned/Updated up LLStyleMap a bit.
Optimized autoresponse code:
- wildcards are now replaced via boost::algorithm::replace_all
- Autoresponse and related chat enhancements are now performed inside their case, instead of by the large if block above.
This commit is contained in:
Lirusaito
2013-05-11 22:36:46 -04:00
parent 0aeafdcca7
commit 9b5360a40b
46 changed files with 1197 additions and 1219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llcommon/llchat.h
View File

@@ -61,6 +61,13 @@ typedef enum e_chat_audible_level
CHAT_AUDIBLE_FULLY = 1
} EChatAudible;
typedef enum e_chat_style
{
CHAT_STYLE_NORMAL,
CHAT_STYLE_IRC,
CHAT_STYLE_HISTORY
}EChatStyle;
// A piece of chat
class LLChat
{
@@ -80,7 +87,8 @@ public:
// [/RLVa:KB]
mTime(0.0),
mPosAgent(),
mURL()
mURL(),
mChatStyle(CHAT_STYLE_NORMAL)
{ }
LLChat(const LLChat &chat)
@@ -93,7 +101,8 @@ public:
mMuted(chat.mMuted),
mTime(chat.mTime),
mPosAgent(chat.mPosAgent),
mURL(chat.mURL)
mURL(chat.mURL),
mChatStyle(chat.mChatStyle)
{ }
std::string mText; // UTF-8 line of text
@@ -110,6 +119,7 @@ public:
F64 mTime; // viewer only, seconds from viewer start
LLVector3 mPosAgent;
std::string mURL;
EChatStyle mChatStyle;
};
#endif

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

@@ -681,6 +681,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruItalicizeActions</key>
<map>
<key>Comment</key>
<string>When enabled, /me chat will be italicized.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruFlyAfterTeleport</key>
<map>
<key>Comment</key>
@@ -15568,6 +15579,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>InstantMessagesFriendsOnly</key>
<map>
<key>Comment</key>
<string>Only accept instant messages from residents on your friends list</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoDisengageMic</key>
<map>
<key>Comment</key>
@@ -16415,6 +16437,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>ClearBeaconAfterTeleport</key>
<map>
<key>Comment</key>
<string>Clear the red tracker beacon after you teleport</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LogTextureDownloadsToViewerLog</key>
<map>
<key>Comment</key>

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

@@ -199,9 +199,9 @@
</map>
<!-- End AO -->
<!-- Ascent Account-Specific (Always) -->
<!-- Ascent Account-Specific (Always) -->
<key>AscentContactGroups</key>
<map>
<key>Comment</key>
@@ -215,72 +215,7 @@
<string />
</array>
</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>
@@ -292,21 +227,11 @@
<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>
<string>Whether to perform the autorespond the moment they begin to type instead of waiting for an actual message</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -314,6 +239,219 @@
<key>Value</key>
<integer>0</integer>
</map>
<!-- Autoresponse Section -->
<key>AutoresponseAnyone</key>
<map>
<key>Comment</key>
<string>Whether to send autoresponse to anyone who isn't muted (or just friends, if AutoresponseAnyoneFriendsOnly)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseAnyoneFriendsOnly</key>
<map>
<key>Comment</key>
<string>Whether to send AutoresponseAnyone to friends only</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseAnyoneItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with AutoresponseAnyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseAnyoneItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with AutoresponseAnyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>AutoresponseAnyoneMessage</key>
<map>
<key>Comment</key>
<string>Message to send as the autoresponse to AutoresponseAnyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>AutoresponseAnyoneShow</key>
<map>
<key>Comment</key>
<string>Whether to show that AutoresponseAnyone's were sent</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseNonFriends</key>
<map>
<key>Comment</key>
<string>Whether to send autoresponse to nonfriends, separately using a different response</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseNonFriendsItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with AutoresponseNonFriends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseNonFriendsItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with AutoresponseNonFriends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>AutoresponseNonFriendsMessage</key>
<map>
<key>Comment</key>
<string>Message to send as the autoresponse to AutoresponseNonFriends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>AutoresponseNonFriendsShow</key>
<map>
<key>Comment</key>
<string>Whether to show that AutoresponseNonFriends's were sent</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseMuted</key>
<map>
<key>Comment</key>
<string>Whether to send autoresponse to muted people</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseMutedItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with AutoresponseMuted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseMutedItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with AutoresponseMuted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>AutoresponseMutedMessage</key>
<map>
<key>Comment</key>
<string>Message to send as the autoresponse to AutoresponseMuted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>BusyModeResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages while in busy mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
</map>
<key>BusyModeResponseItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with BusyModeResponse</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>BusyModeResponseItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with BusyModeResponse</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>BusyModeResponseShow</key>
<map>
<key>Comment</key>
<string>Whether to show that BusyModeResponses were sent</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>EveryoneExport</key>
<map>
<key>Comment</key>
@@ -336,84 +474,7 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>BusyModeResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages while in busy mode.</string>
</map>
<key>AO.Settings</key>
<map>
<key>Comment</key>
<string>List for animation overrider</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>LLSD</string>
<key>Value</key>
<array>
<string/>
</array>
</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>
<!-- Ascent Account-Specific (Always) -->
<!-- General additions -->
<key>rkeastInventoryPreviousCount</key>
<map>
<key>Comment</key>
<string>Used to keep track of the number of items in inventory when fetching for progress reasons. DO NOT EDIT.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>-1</integer>
</map>
<key>rkeastInventorySearchType</key>
<map>
<key>Comment</key>
<string>Controls what type of inventory search we perform.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>rkeastInventoryPartialSearch</key>
<map>
<key>Comment</key>
<string>Toggles whether to search using partial search filters on normal (name, desc, creator) searches.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>BusyModeResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages while in busy mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
</map>
<key>IMLogTimestamp</key>
<map>
<key>Comment</key>

294
indra/newview/app_settings/settings_per_account_ascent.xml
View File

@@ -14,72 +14,7 @@
<string />
</array>
</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>
@@ -91,21 +26,11 @@
<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>
<string>Whether to perform the autorespond the moment they begin to type instead of waiting for an actual message</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -113,5 +38,216 @@
<key>Value</key>
<integer>0</integer>
</map>
<!-- Autoresponse Section -->
<key>AutoresponseAnyone</key>
<map>
<key>Comment</key>
<string>Whether to send autoresponse to anyone who isn't muted (or just friends, if AutoresponseAnyoneFriendsOnly)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseAnyoneFriendsOnly</key>
<map>
<key>Comment</key>
<string>Whether to send AutoresponseAnyone to friends only</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseAnyoneItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with AutoresponseAnyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseAnyoneItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with AutoresponseAnyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>AutoresponseAnyoneMessage</key>
<map>
<key>Comment</key>
<string>Message to send as the autoresponse to AutoresponseAnyone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>AutoresponseAnyoneShow</key>
<map>
<key>Comment</key>
<string>Whether to show that AutoresponseAnyone's were sent</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseNonFriends</key>
<map>
<key>Comment</key>
<string>Whether to send autoresponse to nonfriends, separately using a different response</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseNonFriendsItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with AutoresponseNonFriends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseNonFriendsItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with AutoresponseNonFriends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>AutoresponseNonFriendsMessage</key>
<map>
<key>Comment</key>
<string>Message to send as the autoresponse to AutoresponseNonFriends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>AutoresponseNonFriendsShow</key>
<map>
<key>Comment</key>
<string>Whether to show that AutoresponseNonFriends's were sent</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseMuted</key>
<map>
<key>Comment</key>
<string>Whether to send autoresponse to muted people</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseMutedItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with AutoresponseMuted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoresponseMutedItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with AutoresponseMuted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>AutoresponseMutedMessage</key>
<map>
<key>Comment</key>
<string>Message to send as the autoresponse to AutoresponseMuted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>This is an autoresponse!</string>
</map>
<key>BusyModeResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages while in busy mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
</map>
<key>BusyModeResponseItem</key>
<map>
<key>Comment</key>
<string>Whether to send a item along with BusyModeResponse</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>BusyModeResponseItemID</key>
<map>
<key>Comment</key>
<string>UUID of item to send along with BusyModeResponse</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>BusyModeResponseShow</key>
<map>
<key>Comment</key>
<string>Whether to show that BusyModeResponses were sent</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>
</llsd>

153
indra/newview/ascentprefschat.cpp
View File

@@ -46,8 +46,6 @@
#include "llstartup.h"
LLDropTarget* mObjectDropTarget;
LLPrefsAscentChat* LLPrefsAscentChat::sInst;
LLPrefsAscentChat::LLPrefsAscentChat()
{
@@ -62,44 +60,31 @@ LLPrefsAscentChat::LLPrefsAscentChat()
childSetCommitCallback("time_format_combobox", onCommitTimeDate, this);
childSetCommitCallback("date_format_combobox", onCommitTimeDate, this);
childSetCommitCallback("AscentInstantMessageResponseAnyone", onCommitAutoResponse, this);
childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this);
childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this);
childSetCommitCallback("AscentInstantMessageShowOnTyping", onCommitAutoResponse, this);
childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this);
childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this);
childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this);
if(sInst)delete sInst; sInst = this;
LLView* target_view = getChild<LLView>("im_give_drop_target_rect");
if (target_view)
bool started = (LLStartUp::getStartupState() == STATE_STARTED);
if (!started) // Disable autoresponse when not logged in
{
const std::string drop="drop target";
if (mObjectDropTarget) delete mObjectDropTarget;
mObjectDropTarget = new LLDropTarget(drop, target_view->getRect(), SinguIMResponseItemDrop);//, mAvatarID);
addChild(mObjectDropTarget);
LLView* autoresponse = getChildView("Autoresponse");
autoresponse->setAllChildrenEnabled(false);
autoresponse->setToolTip(LLTrans::getString("NotLoggedIn"));
}
bool started = LLStartUp::getStartupState() == STATE_STARTED;
if (started)
{
LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("AscentInstantMessageResponseItemData");
LLViewerInventoryItem* item = gInventory.getItem(itemid);
if (item)
{
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo", args));
}
else if (itemid.isNull())
childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
else
childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetToAnItemNotOnThisAccount"));
}
else childSetValue("im_give_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
childSetCommitCallback("im_response", onCommitAutoResponse, this);
// Saved per account settings aren't detected by control_name, therefore autoresponse controls get their values here and have them saved during apply.
childSetValue("AscentInstantMessageResponseRepeat", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat"));
childSetValue("AutoresponseAnyone", gSavedPerAccountSettings.getBOOL("AutoresponseAnyone"));
childSetValue("AutoresponseAnyoneFriendsOnly", gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneFriendsOnly"));
childSetValue("AutoresponseAnyoneItem", gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneItem"));
childSetValue("AutoresponseAnyoneMessage", gSavedPerAccountSettings.getString("AutoresponseAnyoneMessage"));
childSetValue("AutoresponseAnyoneShow", gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneShow"));
childSetValue("AutoresponseNonFriends", gSavedPerAccountSettings.getBOOL("AutoresponseNonFriends"));
childSetValue("AutoresponseNonFriendsItem", gSavedPerAccountSettings.getBOOL("AutoresponseNonFriendsItem"));
childSetValue("AutoresponseNonFriendsMessage", gSavedPerAccountSettings.getString("AutoresponseNonFriendsMessage"));
childSetValue("AutoresponseNonFriendsShow", gSavedPerAccountSettings.getBOOL("AutoresponseNonFriendsShow"));
childSetValue("AutoresponseMuted", gSavedPerAccountSettings.getBOOL("AutoresponseMuted"));
childSetValue("AutoresponseMutedItem", gSavedPerAccountSettings.getBOOL("AutoresponseMutedItem"));
childSetValue("AutoresponseMutedMessage", gSavedPerAccountSettings.getString("AutoresponseMutedMessage"));
childSetValue("BusyModeResponse", gSavedPerAccountSettings.getString("BusyModeResponse"));
childSetValue("BusyModeResponseItem", gSavedPerAccountSettings.getBOOL("BusyModeResponseItem"));
childSetValue("BusyModeResponseShow", gSavedPerAccountSettings.getBOOL("BusyModeResponseShow"));
childSetEnabled("reset_antispam", started);
childSetCommitCallback("reset_antispam", onCommitResetAS, this);
@@ -122,8 +107,6 @@ LLPrefsAscentChat::LLPrefsAscentChat()
LLPrefsAscentChat::~LLPrefsAscentChat()
{
sInst=NULL;
delete mObjectDropTarget; mObjectDropTarget=NULL;
}
//static
@@ -231,30 +214,6 @@ void LLPrefsAscentChat::onCommitTimeDate(LLUICtrl* ctrl, void* userdata)
gSavedSettings.setString("TimestampFormat", timestamp);
}
//static
void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
{
LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", self->childGetValue("AscentInstantMessageResponseAnyone"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", self->childGetValue("AscentInstantMessageResponseFriends"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", self->childGetValue("AscentInstantMessageResponseMuted"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", self->childGetValue("AscentInstantMessageShowOnTyping"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", self->childGetValue("AscentInstantMessageShowResponded"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", self->childGetValue("AscentInstantMessageResponseRepeat"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", self->childGetValue("AscentInstantMessageResponseItem"));
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", self->childGetValue("im_response"));
}
//static
void LLPrefsAscentChat::SinguIMResponseItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("AscentInstantMessageResponseItemData", item->getUUID().asString());
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
sInst->childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo", args));
}
//static
void LLPrefsAscentChat::onCommitResetAS(LLUICtrl*, void*)
{
@@ -327,6 +286,7 @@ void LLPrefsAscentChat::refreshValues()
//Chat/IM -----------------------------------------------------------------------------
mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification");
mInstantMessagesFriendsOnly = gSavedSettings.getBOOL("InstantMessagesFriendsOnly");
mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
mShowDisplayNameChanges = gSavedSettings.getBOOL("ShowDisplayNameChanges");
mUseTypingBubbles = gSavedSettings.getBOOL("UseTypingBubbles");
@@ -365,15 +325,6 @@ void LLPrefsAscentChat::refreshValues()
tempTimeFormat = mTimeFormat;
tempDateFormat = mDateFormat;
mIMResponseAnyone = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone");
mIMResponseFriends = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends");
mIMResponseMuted = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
mIMShowOnTyping = gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowOnTyping");
mIMShowResponded = gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded");
mIMResponseRepeat = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat");
mIMResponseItem = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem");
mIMResponseText = gSavedPerAccountSettings.getString("AscentInstantMessageResponse");
//Chat UI -----------------------------------------------------------------------------
mWoLfVerticalIMTabs = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
mOtherChatsTornOff = gSavedSettings.getBOOL("OtherChatsTornOff");
@@ -383,6 +334,30 @@ void LLPrefsAscentChat::refreshValues()
mOneLineGroupButt = gSavedSettings.getBOOL("UseConciseGroupChatButtons");
mOneLineConfButt = gSavedSettings.getBOOL("UseConciseConferenceButtons");
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
mItalicizeActions = gSavedSettings.getBOOL("LiruItalicizeActions");
//Autoresponse ------------------------------------------------------------------------
mIMResponseAnyoneItemID = gSavedPerAccountSettings.getString("AutoresponseAnyoneItemID");
mIMResponseNonFriendsItemID = gSavedPerAccountSettings.getString("AutoresponseNonFriendsItemID");
mIMResponseMutedItemID = gSavedPerAccountSettings.getString("AutoresponseMutedItemID");
mIMResponseBusyItemID = gSavedPerAccountSettings.getString("BusyModeResponseItemID");
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", childGetValue("AscentInstantMessageResponseRepeat"));
gSavedPerAccountSettings.setBOOL("AutoresponseAnyone", childGetValue("AutoresponseAnyone"));
gSavedPerAccountSettings.setBOOL("AutoresponseAnyoneFriendsOnly", childGetValue("AutoresponseAnyoneFriendsOnly"));
gSavedPerAccountSettings.setBOOL("AutoresponseAnyoneItem", childGetValue("AutoresponseAnyoneItem"));
gSavedPerAccountSettings.setString("AutoresponseAnyoneMessage", childGetValue("AutoresponseAnyoneMessage"));
gSavedPerAccountSettings.setBOOL("AutoresponseAnyoneShow", childGetValue("AutoresponseAnyoneShow"));
gSavedPerAccountSettings.setBOOL("AutoresponseNonFriends", childGetValue("AutoresponseNonFriends"));
gSavedPerAccountSettings.setBOOL("AutoresponseNonFriendsItem", childGetValue("AutoresponseNonFriendsItem"));
gSavedPerAccountSettings.setString("AutoresponseNonFriendsMessage", childGetValue("AutoresponseNonFriendsMessage"));
gSavedPerAccountSettings.setBOOL("AutoresponseNonFriendsShow", childGetValue("AutoresponseNonFriendsShow"));
gSavedPerAccountSettings.setBOOL("AutoresponseMuted", childGetValue("AutoresponseMuted"));
gSavedPerAccountSettings.setBOOL("AutoresponseMutedItem", childGetValue("AutoresponseMutedItem"));
gSavedPerAccountSettings.setString("AutoresponseMutedMessage", childGetValue("AutoresponseMutedMessage"));
gSavedPerAccountSettings.setString("BusyModeResponse", childGetValue("BusyModeResponse"));
gSavedPerAccountSettings.setBOOL("BusyModeResponseItem", childGetValue("BusyModeResponseItem"));
gSavedPerAccountSettings.setBOOL("BusyModeResponseShow", childGetValue("BusyModeResponseShow"));
//Spam --------------------------------------------------------------------------------
mEnableAS = gSavedSettings.getBOOL("AntiSpamEnabled");
@@ -434,19 +409,6 @@ void LLPrefsAscentChat::refresh()
combo->setCurrentByIndex(mDateFormat);
}
childSetValue("AscentInstantMessageResponseAnyone", mIMResponseAnyone);
childSetValue("AscentInstantMessageResponseFriends", mIMResponseFriends);
childSetValue("AscentInstantMessageResponseMuted", mIMResponseMuted);
childSetValue("AscentInstantMessageShowOnTyping", mIMShowOnTyping);
childSetValue("AscentInstantMessageShowResponded", mIMShowResponded);
childSetValue("AscentInstantMessageResponseRepeat", mIMResponseRepeat);
childSetValue("AscentInstantMessageResponseItem", mIMResponseItem);
LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
LLWStringUtil::replaceChar(auto_response, '^', '\n');
LLWStringUtil::replaceChar(auto_response, '%', ' ');
childSetText("im_response", wstring_to_utf8str(auto_response));
//Antispam ------------------------------------------------------------------------
// sensitivity tuners
childSetEnabled("spammsg_checkbox", mEnableAS);
@@ -544,6 +506,7 @@ void LLPrefsAscentChat::cancel()
//Chat/IM -----------------------------------------------------------------------------
gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification);
gSavedSettings.setBOOL("InstantMessagesFriendsOnly", mInstantMessagesFriendsOnly);
gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM);
gSavedSettings.setBOOL("ShowDisplayNameChanges", mShowDisplayNameChanges);
gSavedSettings.setBOOL("UseTypingBubbles", mUseTypingBubbles);
@@ -595,15 +558,6 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setString("LongTimeFormat", long_time);
gSavedSettings.setString("TimestampFormat", timestamp);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", mIMResponseAnyone);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", mIMResponseMuted);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", mIMShowOnTyping);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", mIMShowResponded);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", mIMResponseRepeat);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", mIMResponseItem);
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", mIMResponseText);
//Chat UI -----------------------------------------------------------------------------
gSavedSettings.setBOOL("WoLfVerticalIMTabs", mWoLfVerticalIMTabs);
gSavedSettings.setBOOL("OtherChatsTornOff", mOtherChatsTornOff);
@@ -613,6 +567,13 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setBOOL("UseConciseGroupChatButtons", mOneLineGroupButt);
gSavedSettings.setBOOL("UseConciseConferenceButtons", mOneLineConfButt);
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
gSavedSettings.setBOOL("LiruItalicizeActions", mItalicizeActions);
//Autoresponse ------------------------------------------------------------------------
gSavedPerAccountSettings.setString("AutoresponseAnyoneItemID", mIMResponseAnyoneItemID);
gSavedPerAccountSettings.setString("AutoresponseNonFriendsItemID", mIMResponseNonFriendsItemID);
gSavedPerAccountSettings.setString("AutoresponseMutedItemID", mIMResponseMutedItemID);
gSavedPerAccountSettings.setString("BusyModeResponseItemID", mIMResponseBusyItemID);
//Spam --------------------------------------------------------------------------------
gSavedSettings.setBOOL("AntiSpamEnabled", mEnableAS);
@@ -632,7 +593,7 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setU32("_NACL_AntiSpamSoundMulti", mSoundMulti);
gSavedSettings.setU32("_NACL_AntiSpamNewlines", mNewLines);
gSavedSettings.setU32("_NACL_AntiSpamSoundPreloadMulti", mPreloadMulti);
gSavedSettings.setBOOL("EnableGestureSounds", mEnableGestureSounds);
gSavedSettings.setBOOL("EnableGestureSounds", mEnableGestureSounds);
//Text Options ------------------------------------------------------------------------
gSavedSettings.setBOOL("SpellDisplay", mSpellDisplay);
@@ -649,8 +610,6 @@ void LLPrefsAscentChat::cancel()
// Update local copy so cancel has no effect
void LLPrefsAscentChat::apply()
{
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", childGetValue("im_response"));
refreshValues();
refresh();
}

23
indra/newview/ascentprefschat.h
View File

@@ -34,8 +34,6 @@
#include "llpanel.h"
#include "lldroptarget.h"
class LLPrefsAscentChat : public LLPanel
{
@@ -55,7 +53,6 @@ protected:
static void onSpellEditCustom(void* data);
static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
static void onCommitResetAS(LLUICtrl*,void*);
static void onCommitEnableAS(LLUICtrl*, void*);
static void onCommitDialogBlock(LLUICtrl*, void*);
@@ -64,6 +61,7 @@ protected:
//Chat/IM -----------------------------------------------------------------------------
BOOL mIMAnnounceIncoming;
BOOL mHideTypingNotification;
bool mInstantMessagesFriendsOnly;
BOOL mShowGroupNameInChatIM;
bool mShowDisplayNameChanges;
bool mUseTypingBubbles;
@@ -79,15 +77,6 @@ protected:
BOOL mSecondsInChatAndIMs;
BOOL mSecondsInLog;
BOOL mIMResponseAnyone;
BOOL mIMResponseFriends;
BOOL mIMResponseMuted;
BOOL mIMShowOnTyping;
BOOL mIMShowResponded;
BOOL mIMResponseRepeat;
BOOL mIMResponseItem;
std::string mIMResponseText;
//Chat UI -----------------------------------------------------------------------------
bool mWoLfVerticalIMTabs;
bool mOtherChatsTornOff;
@@ -97,6 +86,13 @@ protected:
bool mOneLineGroupButt;
bool mOneLineConfButt;
bool mOnlyComm;
bool mItalicizeActions;
//Autoresponse ------------------------------------------------------------------------
std::string mIMResponseAnyoneItemID;
std::string mIMResponseNonFriendsItemID;
std::string mIMResponseMutedItemID;
std::string mIMResponseBusyItemID;
//Spam --------------------------------------------------------------------------------
BOOL mEnableAS;
@@ -128,9 +124,6 @@ protected:
LLColor4 mKeywordsColor;
BOOL mKeywordsPlaySound;
LLUUID mKeywordsSound;
private:
static LLPrefsAscentChat* sInst;
static void SinguIMResponseItemDrop(LLViewerInventoryItem* item);
};
#endif

47
indra/newview/ascentprefssys.cpp
View File

@@ -44,12 +44,8 @@
#include "lltexturectrl.h"
#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llstartup.h"
#include "lltrans.h"
LLDropTarget* mBuildDropTarget;
LLPrefsAscentSys* LLPrefsAscentSys::sInst;
LLPrefsAscentSys::LLPrefsAscentSys()
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
@@ -91,42 +87,12 @@ LLPrefsAscentSys::LLPrefsAscentSys()
getChild<LLTextureCtrl>("texture control")->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("EmeraldBuildPrefs_Texture")));
childSetCommitCallback("texture control", onCommitTexturePicker, this);
if(sInst)delete sInst; sInst = this;
LLView* target_view = getChild<LLView>("build_item_drop_target_rect");
if (target_view)
{
const std::string drop="drop target";
if (mBuildDropTarget) delete mBuildDropTarget;
mBuildDropTarget = new LLDropTarget(drop, target_view->getRect(), SinguBuildItemDrop);//, mAvatarID);
addChild(mBuildDropTarget);
}
if (LLStartUp::getStartupState() == STATE_STARTED)
{
LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item");
LLViewerInventoryItem* item = gInventory.getItem(itemid);
if (item)
{
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo", args));
}
else if (itemid.isNull())
childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
else
childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetToAnItemNotOnThisAccount"));
}
else childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
refreshValues();
refresh();
}
LLPrefsAscentSys::~LLPrefsAscentSys()
{
sInst=NULL;
delete mBuildDropTarget; mBuildDropTarget=NULL;
}
//static
@@ -253,21 +219,13 @@ void LLPrefsAscentSys::onCommitTexturePicker(LLUICtrl* ctrl, void* userdata)
if(image_ctrl) gSavedSettings.setString("EmeraldBuildPrefs_Texture", image_ctrl->getImageAssetID().asString());
}
//static
void LLPrefsAscentSys::SinguBuildItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("EmeraldBuildPrefs_Item", item->getUUID().asString());
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
sInst->childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo", args));
}
void LLPrefsAscentSys::refreshValues()
{
//General -----------------------------------------------------------------------------
mDoubleClickTeleport = gSavedSettings.getBOOL("DoubleClickTeleport");
mResetCameraAfterTP = gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
mOffsetTPByUserHeight = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
mClearBeaconAfterTeleport = gSavedSettings.getBOOL("ClearBeaconAfterTeleport");
mLiruFlyAfterTeleport = gSavedSettings.getBOOL("LiruFlyAfterTeleport");
mLiruContinueFlying = gSavedSettings.getBOOL("LiruContinueFlyingOnUnsit");
mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld");
@@ -323,6 +281,7 @@ void LLPrefsAscentSys::refreshValues()
mColor = gSavedSettings.getColor4("EmeraldBuildPrefs_Color");
mFullBright = gSavedSettings.getBOOL("EmeraldBuildPrefs_FullBright");
mGlow = gSavedSettings.getF32("EmeraldBuildPrefs_Glow");
mItem = gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item");
mMaterial = gSavedSettings.getString("BuildPrefs_Material");
mNextCopy = gSavedSettings.getBOOL("NextOwnerCopy");
mNextMod = gSavedSettings.getBOOL("NextOwnerModify");
@@ -420,6 +379,7 @@ void LLPrefsAscentSys::cancel()
gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
gSavedSettings.setBOOL("ClearBeaconAfterTeleport", mClearBeaconAfterTeleport);
gSavedSettings.setBOOL("LiruFlyAfterTeleport", mLiruFlyAfterTeleport);
gSavedSettings.setBOOL("LiruContinueFlyingOnUnsit", mLiruContinueFlying);
gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
@@ -474,6 +434,7 @@ void LLPrefsAscentSys::cancel()
gSavedSettings.setColor4("EmeraldBuildPrefs_Color", mColor);
gSavedSettings.setBOOL("EmeraldBuildPrefs_FullBright", mFullBright);
gSavedSettings.setF32("EmeraldBuildPrefs_Glow", mGlow);
gSavedPerAccountSettings.setString("EmeraldBuildPrefs_Item", mItem);
gSavedSettings.setString("BuildPrefs_Material", mMaterial);
gSavedSettings.setBOOL("NextOwnerCopy", mNextCopy);
gSavedSettings.setBOOL("NextOwnerModify", mNextMod);

8
indra/newview/ascentprefssys.h
View File

@@ -34,8 +34,6 @@
#include "llpanel.h"
#include "lldroptarget.h"
class LLPrefsAscentSys : public LLPanel
{
@@ -58,6 +56,7 @@ protected:
BOOL mDoubleClickTeleport;
BOOL mResetCameraAfterTP;
BOOL mOffsetTPByUserHeight;
bool mClearBeaconAfterTeleport;
bool mLiruFlyAfterTeleport;
bool mLiruContinueFlying;
BOOL mPreviewAnimInWorld;
@@ -107,11 +106,13 @@ protected:
bool mDisableClickSitOtherOwner;
BOOL mDisplayScriptJumps;
F32 mNumScriptDiff;
//Build -------------------------------------------------------------------------------
F32 mAlpha;
LLColor4 mColor;
BOOL mFullBright;
F32 mGlow;
std::string mItem;
std::string mMaterial;
BOOL mNextCopy;
BOOL mNextMod;
@@ -124,9 +125,6 @@ protected:
F32 mXsize;
F32 mYsize;
F32 mZsize;
private:
static LLPrefsAscentSys* sInst;
static void SinguBuildItemDrop(LLViewerInventoryItem* item);
};
#endif

112
indra/newview/floaterao.cpp
View File

@@ -136,73 +136,6 @@ BOOL AOInvTimer::tick()
}
return FALSE;
}
// NC DROP -------------------------------------------------------
class AONoteCardDropTarget : public LLView
{
public:
AONoteCardDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*));
~AONoteCardDropTarget();
void doDrop(EDragAndDropType cargo_type, void* cargo_data);
//
// LLView functionality
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
protected:
void (*mDownCallback)(LLViewerInventoryItem*);
};
AONoteCardDropTarget::AONoteCardDropTarget(const std::string& name, const LLRect& rect,
void (*callback)(LLViewerInventoryItem*)) :
LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
mDownCallback(callback)
{
}
AONoteCardDropTarget::~AONoteCardDropTarget()
{
}
void AONoteCardDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
{
// llinfos << "AONoteCardDropTarget::doDrop()" << llendl;
}
BOOL AONoteCardDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg)
{
BOOL handled = FALSE;
if(getParent())
{
handled = TRUE;
LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
if(gInventory.getItem(inv_item->getUUID()))
{
*accept = ACCEPT_YES_COPY_SINGLE;
if(drop)
{
mDownCallback(inv_item);
}
}
else
{
*accept = ACCEPT_NO;
}
}
return handled;
}
AONoteCardDropTarget * LLFloaterAO::mAOItemDropTarget;
// STUFF -------------------------------------------------------
@@ -283,8 +216,6 @@ LLFloaterAO::~LLFloaterAO()
mcomboBox_lands = 0;
mcomboBox_standups = 0;
mcomboBox_prejumps = 0;
delete mAOItemDropTarget;
mAOItemDropTarget = NULL;
// llinfos << "floater destroyed" << llendl;
}
@@ -315,39 +246,6 @@ bool LLFloaterAO::getInstance()
BOOL LLFloaterAO::postBuild()
{
LLView *target_view = getChild<LLView>("ao_notecard");
if(target_view)
{
if (mAOItemDropTarget)
{
delete mAOItemDropTarget;
}
mAOItemDropTarget = new AONoteCardDropTarget("drop target", target_view->getRect(), AOItemDrop);//, mAvatarID);
addChild(mAOItemDropTarget);
}
if(LLStartUp::getStartupState() == STATE_STARTED)
{
LLUUID itemidimport = (LLUUID)gSavedPerAccountSettings.getString("AOConfigNotecardID");
LLViewerInventoryItem* itemimport = gInventory.getItem(itemidimport);
if(itemimport)
{
LLStringUtil::format_map_t args;
args["[ITEM]"] = itemimport->getName();
childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo", args));
}
else if(itemidimport.isNull())
{
childSetValue("ao_nc_text", LLTrans::getString("CurrentlyNotSet"));
}
else
{
childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetToAnItemNotOnThisAccount"));
}
}
else
{
childSetValue("ao_nc_text", LLTrans::getString("NotLoggedIn"));
}
childSetAction("more_btn", onClickMore, this);
childSetAction("less_btn", onClickLess, this);
@@ -793,14 +691,6 @@ void LLFloaterAO::setCurrentStandId(const LLUUID& id)
mCurrentStandId = id;
}
void LLFloaterAO::AOItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("AOConfigNotecardID", item->getUUID().asString());
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
sInstance->childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo", args));
}
LLUUID LLFloaterAO::GetAnimID(const LLUUID& id)
{
for (std::vector<struct_overrides>::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
@@ -1383,7 +1273,7 @@ BOOL LLFloaterAO::SetDefault(void* userdata, LLUUID ao_id, std::string defaultan
if (sInstance && (userdata))
{
LLComboBox *box = (LLComboBox *) userdata;
if (LLUUID::null == ao_id)
if (ao_id.isNull())
{
box->clear();
box->removeall();

4
indra/newview/floaterao.h
View File

@@ -8,8 +8,6 @@
#include "lleventtimer.h"
class AONoteCardDropTarget;
const int STATE_AGENT_IDLE = 0;
const int STATE_AGENT_WALK = 1;
const int STATE_AGENT_RUN = 2;
@@ -113,8 +111,6 @@ private:
static int mAnimationState;
static LLUUID mCurrentStandId;
static AONoteCardDropTarget* mAOItemDropTarget;
static void AOItemDrop(LLViewerInventoryItem* item);
static void onSpinnerCommit(LLUICtrl* ctrl);
static void onComboBoxCommit(LLUICtrl* ctrl);
static BOOL SetDefault(void *userdata, LLUUID ao_id, std::string defaultanim);

2
indra/newview/llagent.cpp
View File

@@ -3862,7 +3862,7 @@ bool LLAgent::teleportCore(bool is_local)
// close the map panel so we can see our destination.
// we don't close search floater, see EXT-5840.
LLFloaterWorldMap::hide(NULL);
LLFloaterWorldMap::hide();
// hide land floater too - it'll be out of date
LLFloaterLand::hideInstance();

143
indra/newview/lldroptarget.cpp
View File

@@ -40,24 +40,127 @@
#include "llviewerprecompiledheaders.h"
#include "lldroptarget.h"
#include "lltooldraganddrop.h"
#include "llinventorymodel.h"
LLDropTarget::LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id) :
LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
mAgentID(agent_id),
mDownCallback(NULL)
#include "llinventorymodel.h"
#include "llstartup.h"
#include "lltextbox.h"
#include "lltooldraganddrop.h"
#include "lltrans.h"
static LLRegisterWidget<LLDropTarget> r("drop_target");
static std::string currently_set_to(const LLViewerInventoryItem* item)
{
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
return LLTrans::getString("CurrentlySetTo", args);
}
LLDropTarget::LLDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*)) :
LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
mDownCallback(callback)
LLDropTarget::LLDropTarget(const LLDropTarget::Params& p)
: LLView(p)
{
setToolTip(std::string(p.tool_tip));
mText = new LLTextBox("drop_text", p.rect, p.label);
addChild(mText);
setControlName(p.control_name, NULL);
mText->setOrigin(0, 0);
mText->setFollows(FOLLOWS_NONE);
mText->setHAlign(LLFontGL::HCENTER);
mText->setBorderVisible(true);
mText->setBorderColor(LLUI::sColorsGroup->getColor("DefaultHighlightLight"));
if (p.fill_parent) fillParent(getParent());
}
LLDropTarget::~LLDropTarget()
{
delete mText;
}
// static
LLView* LLDropTarget::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory* factory)
{
LLDropTarget* target = new LLDropTarget();
target->initFromXML(node, parent);
return target;
}
// virtual
void LLDropTarget::initFromXML(LLXMLNodePtr node, LLView* parent)
{
LLView::initFromXML(node, parent);
const LLRect& rect = getRect();
mText->setRect(LLRect(0, rect.getHeight(), rect.getWidth(), 0));
if (node->hasAttribute("name")) // Views can't have names, but drop targets can
{
std::string name;
node->getAttributeString("name", name);
setName(name);
}
if (node->hasAttribute("label"))
{
std::string label;
node->getAttributeString("label", label);
mText->setText(label);
}
if (node->hasAttribute("fill_parent"))
{
bool fill;
node->getAttribute_bool("fill_parent", fill);
if (fill) fillParent(parent);
}
}
// virtual
void LLDropTarget::setControlName(const std::string& control_name, LLView* context)
{
if (control_name.empty()) // The "empty set"
{
mControl = NULL;
return; // This DropTarget never changes text, it isn't tied to a control
}
std::string text;
if (LLStartUp::getStartupState() != STATE_STARTED) // Too early for PerAccount
{
text = LLTrans::getString("NotLoggedIn");
}
else
{
mControl = gSavedPerAccountSettings.getControl(control_name);
const LLUUID id(mControl->getValue().asString());
if (id.isNull())
text = LLTrans::getString("CurrentlyNotSet");
else if (LLViewerInventoryItem* item = gInventory.getItem(id))
text = currently_set_to(item);
else
text = LLTrans::getString("CurrentlySetToAnItemNotOnThisAccount");
}
mText->setText(text);
}
void LLDropTarget::fillParent(const LLView* parent)
{
if (!parent) return; // No parent to fill
const std::string& tool_tip = getToolTip();
if (!tool_tip.empty()) // Don't tool_tip the entire parent
{
mText->setToolTip(tool_tip);
setToolTip(LLStringExplicit(""));
}
// The following block enlarges the target, but maintains the desired size for the text and border
mText->setRect(getRect()); // mText takes over the old rectangle, since the position will now be relative to the parent's rectangle for the text.
const LLRect& parent_rect = parent->getRect();
setRect(LLRect(0, parent_rect.getHeight(), parent_rect.getWidth(), 0));
}
void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
@@ -67,17 +170,23 @@ void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg)
{
if(!getParent()) return false;
if(!mDownCallback) LLToolDragAndDrop::handleGiveDragAndDrop(mAgentID, LLUUID::null, drop, cargo_type, cargo_data, accept);
else
if (mEntityID.isNull())
{
LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
if (gInventory.getItem(inv_item->getUUID()))
if (LLViewerInventoryItem* inv_item = static_cast<LLViewerInventoryItem*>(cargo_data))
{
*accept = ACCEPT_YES_COPY_SINGLE;
if (drop) mDownCallback(inv_item);
if (drop)
{
mText->setText(currently_set_to(inv_item));
if (mControl) mControl->setValue(inv_item->getUUID().asString());
}
}
else *accept = ACCEPT_NO;
else
{
*accept = ACCEPT_NO;
}
return true;
}
return true;
return getParent() ? LLToolDragAndDrop::handleGiveDragAndDrop(mEntityID, LLUUID::null, drop, cargo_type, cargo_data, accept) : false;
}

35
indra/newview/lldroptarget.h
View File

@@ -42,23 +42,44 @@
#include "stdtypes.h"
#include "llview.h"
class LLViewerInventoryItem;
class LLDropTarget : public LLView
{
public:
LLDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*));
LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id);
struct Params : public LLInitParam::Block<Params, LLView::Params>
{
Optional<std::string> control_name; // Control to change on item drop (Per Account only)
Optional<std::string> label; // Label for the LLTextBox, used when label doesn't dynamically change on drop
Optional<bool> fill_parent; // Whether or not to fill the direct parent, to have a larger drop target. If true, the next sibling must explicitly define its rect without deltas.
Params()
: control_name("control_name", "")
, label("label", "")
, fill_parent("fill_parent", false)
{
changeDefault(mouse_opaque, false);
changeDefault(follows.flags, FOLLOWS_ALL);
}
};
LLDropTarget(const Params& p = Params());
~LLDropTarget();
void doDrop(EDragAndDropType cargo_type, void* cargo_data);
virtual void doDrop(EDragAndDropType cargo_type, void* cargo_data);
//
// LLView functionality
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
void setAgentID(const LLUUID &agent_id){ mAgentID = agent_id;}
static LLView* fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory);
virtual void initFromXML(LLXMLNodePtr node, LLView* parent);
virtual void setControlName(const std::string& control, LLView* context);
void fillParent(const LLView* parent);
void setEntityID(const LLUUID& id) { mEntityID = id;}
protected:
LLUUID mAgentID;
void (*mDownCallback)(LLViewerInventoryItem*);
LLUUID mEntityID;
private:
LLControlVariable* mControl;
class LLTextBox* mText;
};
#endif // LLDROPTARGET_H

6
indra/newview/llfloateravatarlist.cpp
View File

@@ -1186,7 +1186,7 @@ void LLFloaterAvatarList::onClickTrack()
if (mTracking && mTrackedAvatar == agent_id)
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
mTracking = FALSE;
}
else
@@ -1203,7 +1203,7 @@ void LLFloaterAvatarList::refreshTracker()
{
if (!mTracking) return;
if (LLTracker::isTracking(NULL))
if (LLTracker::isTracking())
{
if(LLAvatarListEntry* entry = getAvatarEntry(mTrackedAvatar))
{
@@ -1215,7 +1215,7 @@ void LLFloaterAvatarList::refreshTracker()
}
else
{ // Tracker stopped.
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
mTracking = FALSE;
// llinfos << "Tracking stopped." << llendl;
}

83
indra/newview/llfloaterchat.cpp
View File

@@ -38,54 +38,32 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterchat.h"
#include "llfloateractivespeakers.h"
#include "llfloaterscriptdebug.h"
#include "llchat.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
#include "llstring.h"
#include "message.h"
// project include
#include "llagent.h"
#include "llbutton.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "llconsole.h"
#include "llfloaterchatterbox.h"
#include "llfloatermute.h"
#include "llkeyboard.h"
//#include "lllineeditor.h"
#include "llmutelist.h"
//#include "llresizehandle.h"
#include "llchatbar.h"
#include "llstatusbar.h"
#include "llviewertexteditor.h"
#include "llviewergesture.h" // for triggering gestures
#include "llviewermessage.h"
#include "llviewerwindow.h"
#include "llviewercontrol.h"
#include "lluictrlfactory.h"
#include "llchatbar.h"
#include "lllogchat.h"
#include "lltexteditor.h"
#include "lltextparser.h"
#include "llfloaterhtml.h"
#include "llweb.h"
#include "llstylemap.h"
#include "ascentkeyword.h"
// linden library includes
#include "llaudioengine.h"
#include "llchat.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
#include "llstring.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lltextparser.h"
#include "lltrans.h"
#include "llwindow.h"
#include "message.h"
// project include
#include "ascentkeyword.h"
#include "llagent.h"
#include "llchatbar.h"
#include "llconsole.h"
#include "llfloateractivespeakers.h"
#include "llfloaterchatterbox.h"
#include "llfloatermute.h"
#include "llfloaterscriptdebug.h"
#include "lllogchat.h"
#include "llmutelist.h"
#include "llstylemap.h"
#include "lluictrlfactory.h"
#include "llviewermessage.h"
#include "llviewertexteditor.h"
#include "llviewerwindow.h"
#include "llweb.h"
// [RLVa:KB]
#include "rlvhandler.h"
@@ -227,9 +205,9 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
// If the msg is from an agent (not yourself though),
// extract out the sender name and replace it with the hotlinked name.
if (chat.mSourceType == CHAT_SOURCE_AGENT &&
// chat.mFromID != LLUUID::null)
// chat.mFromID.notNull())
// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
chat.mFromID != LLUUID::null &&
chat.mFromID.notNull() &&
(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
// [/RLVa:KB]
{
@@ -238,20 +216,27 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
if(chat.mSourceType == CHAT_SOURCE_OBJECT && !chat.mFromName.length())
{
chat.mFromName = "(no name)";
chat.mFromName = LLTrans::getString("Unnamed");
line = chat.mFromName + line;
}
static const LLCachedControl<bool> italicize("LiruItalicizeActions");
bool is_irc = italicize && chat.mChatStyle == CHAT_STYLE_IRC;
// If the chat line has an associated url, link it up to the name.
if (!chat.mURL.empty()
&& (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
{
std::string start_line = line.substr(0, chat.mFromName.length() + 1);
line = line.substr(chat.mFromName.length() + 1);
const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
LLStyleSP sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
sourceStyle->mItalic = is_irc;
edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
prepend_newline = false;
}
edit->appendColoredText(line, false, prepend_newline, color);
LLStyleSP style(new LLStyle);
style->setColor(color);
style->mItalic = is_irc;
edit->appendStyledText(line, false, prepend_newline, style);
}
void log_chat_text(const LLChat& chat)

2
indra/newview/llfloaterlandholdings.cpp
View File

@@ -300,7 +300,7 @@ void LLFloaterLandHoldings::buttonCore(S32 which)
break;
case 1:
gFloaterWorldMap->trackLocation(pos_global);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
break;
default:
break;

2
indra/newview/llfloaterteleporthistory.cpp
View File

@@ -353,7 +353,7 @@ void LLFloaterTeleportHistory::onShowOnMap(void* data)
// point world map at position
gFloaterWorldMap->trackURL(region, x, y, z);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
// static

44
indra/newview/llfloaterworldmap.cpp
View File

@@ -42,8 +42,6 @@
#include "llagent.h"
#include "llagentcamera.h"
#include "llviewerwindow.h"
#include "llwindow.h"
#include "llbutton.h"
#include "llcallingcard.h"
#include "llcolorscheme.h"
@@ -57,9 +55,8 @@
#include "llinventorymodelbackgroundfetch.h"
#include "llinventoryobserver.h"
#include "lllandmarklist.h"
#include "llnotificationsutil.h"
#include "lllineeditor.h"
#include "llpreviewlandmark.h"
#include "llnotificationsutil.h"
#include "llregionhandle.h"
#include "llscrolllistctrl.h"
#include "lltextbox.h"
@@ -76,10 +73,9 @@
#include "llappviewer.h"
#include "llmapimagetype.h"
#include "llweb.h"
#include "llwindow.h" // copyTextToClipboard()
#include "llglheaders.h"
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
@@ -104,6 +100,7 @@ struct SortRegionNames
return(LLStringUtil::compareInsensitive(_left.second->getName(), _right.second->getName()) < 0);
}
};
enum EPanDirection
{
PAN_UP,
@@ -284,7 +281,7 @@ void LLFloaterWorldMap::onClose(bool app_quitting)
}
// static
void LLFloaterWorldMap::show(void*, BOOL center_on_target)
void LLFloaterWorldMap::show(bool center_on_target)
{
// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0c)
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP))
@@ -351,13 +348,13 @@ void LLFloaterWorldMap::reloadIcons(void*)
// static
void LLFloaterWorldMap::toggle(void*)
void LLFloaterWorldMap::toggle()
{
BOOL visible = gFloaterWorldMap->getVisible();
if (!visible)
{
show(NULL, FALSE);
show(false);
}
else
{
@@ -368,7 +365,7 @@ void LLFloaterWorldMap::toggle(void*)
// static
void LLFloaterWorldMap::hide(void*)
void LLFloaterWorldMap::hide()
{
gFloaterWorldMap->mIsClosing = TRUE;
gFloaterWorldMap->close();
@@ -547,7 +544,7 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string&
}
else
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
setDefaultBtn("Teleport");
}
@@ -591,7 +588,7 @@ void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
}
else
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
setDefaultBtn("Teleport");
}
@@ -618,7 +615,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
{
// We haven't found a region for that point yet, leave the tracking to the world map
LLWorldMap::getInstance()->setTracking(pos_global);
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
S32 world_x = S32(pos_global.mdV[0] / 256);
S32 world_y = S32(pos_global.mdV[1] / 256);
LLWorldMapMessage::getInstance()->sendMapBlockRequest(world_x, world_y, world_x, world_y, true);
@@ -635,7 +632,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
// i.e. let the world map that this and tell it it's invalid
LLWorldMap::getInstance()->setTracking(pos_global);
LLWorldMap::getInstance()->setTrackingInvalid();
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
setDefaultBtn("");
// clicked on a down region - turn off coord display
@@ -774,10 +771,9 @@ void LLFloaterWorldMap::updateLocation()
// simNameFromPosGlobal can fail, so don't give the user an invalid SLURL
if ( gotSimName )
{
LLVector3d agentPos = gAgent.getPositionGlobal();
S32 x = llround( (F32)fmod( (F32)agentPos[VX], (F32)REGION_WIDTH_METERS ) );
S32 y = llround( (F32)fmod( (F32)agentPos[VY], (F32)REGION_WIDTH_METERS ) );
S32 z = llround( (F32)agentPos[VZ] );
S32 x = llround( (F32)fmod( (F32)coord_pos[VX], (F32)REGION_WIDTH_METERS ) );
S32 y = llround( (F32)fmod( (F32)coord_pos[VY], (F32)REGION_WIDTH_METERS ) );
S32 z = llround( (F32)coord_pos[VZ] );
mSLURL = LLURLDispatcher::buildSLURL(sim_name, x, y, z);
}
else
@@ -880,7 +876,7 @@ void LLFloaterWorldMap::friendsChanged()
(buddy_info && !buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)) ||
gAgent.isGodlike())
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
}
}
@@ -1100,7 +1096,7 @@ void LLFloaterWorldMap::onLandmarkComboPrearrange( LLUICtrl* ctrl, void* userdat
if( current_choice.isNull() || !list->setCurrentByID( current_choice ) )
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
}
@@ -1110,7 +1106,7 @@ void LLFloaterWorldMap::onComboTextEntry( LLLineEditor* ctrl, void* userdata )
// Reset the tracking whenever we start typing into any of the search fields,
// so that hitting <enter> does an auto-complete versus teleporting us to the
// previously selected landmark/friend.
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
// static
@@ -1134,7 +1130,7 @@ void LLFloaterWorldMap::onLandmarkComboCommit()
LLUUID asset_id;
LLUUID item_id = list->getCurrentID();
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
//RN: stopTracking() clears current combobox selection, need to reassert it here
list->setCurrentByID(item_id);
@@ -1190,7 +1186,7 @@ void LLFloaterWorldMap::onAvatarComboPrearrange( LLUICtrl* ctrl, void* userdata
if( !list->setCurrentByID( current_choice ) || current_choice.isNull() )
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
}
@@ -1297,7 +1293,7 @@ void LLFloaterWorldMap::onCoordinatesCommit()
void LLFloaterWorldMap::onClearBtn()
{
mTrackedStatus = LLTracker::TRACKING_NOTHING;
LLTracker::stopTracking((void *)(intptr_t)TRUE);
LLTracker::stopTracking(true);
LLWorldMap::getInstance()->cancelTracking();
mSLURL = ""; // Clear the SLURL since it's invalid
mSetToUserPosition = TRUE; // Revert back to the current user position

6
indra/newview/llfloaterworldmap.h
View File

@@ -63,10 +63,10 @@ public:
/*virtual*/ void onClose(bool app_quitting);
static void show(void*, BOOL center_on_target );
static void show(bool center_on_target);
static void reloadIcons(void*);
static void toggle(void*);
static void hide(void*);
static void toggle();
static void hide();
/*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);

202
indra/newview/llimpanel.cpp
View File

@@ -1123,7 +1123,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
{
llwarns << "Other participant is NULL" << llendl;
}
init(session_label);
}
@@ -1160,7 +1160,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
{
llwarns << "Other participant is NULL" << llendl;
}
mSessionInitialTargetIDs = ids;
init(session_label);
}
@@ -1173,9 +1173,9 @@ void LLFloaterIMPanel::init(const std::string& session_label)
mSessionLabel = session_label;
// [Ansariel: Display name support]
mProfileButtonEnabled = FALSE;
// [/Ansariel: Display name support]
// [Ansariel: Display name support]
mProfileButtonEnabled = FALSE;
// [/Ansariel: Display name support]
static LLCachedControl<bool> concise_im("UseConciseIMButtons");
static LLCachedControl<bool> concise_group("UseConciseGroupChatButtons");
@@ -1610,25 +1610,25 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
static const LLCachedControl<bool> mKeywordsChangeColor(gSavedPerAccountSettings, "KeywordsChangeColor", false);
static const LLCachedControl<LLColor4> mKeywordsColor(gSavedPerAccountSettings, "KeywordsColor", LLColor4(1.f, 1.f, 1.f, 1.f));
if (gAgent.getID() != source)
if (gAgentID != source)
{
if (mKeywordsChangeColor)
{
if (AscentKeyword::hasKeyword(utf8msg, 2))
{
if (AscentKeyword::hasKeyword(utf8msg, 2))
{
incolor = mKeywordsColor;
}
}
}
}
const LLColor4& color = incolor;
// start tab flashing when receiving im for background session from user
if (source != LLUUID::null)
if (source.notNull())
{
LLMultiFloater* hostp = getHost();
if( !isInVisibleChain()
&& hostp
&& source != gAgent.getID())
&& source != gAgentID)
{
hostp->setFloaterFlashing(this, TRUE);
}
@@ -1640,14 +1640,15 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
removeTypingIndicator(NULL);
// Actually add the line
std::string timestring;
bool prepend_newline = true;
if (gSavedSettings.getBOOL("IMShowTimestamps"))
{
timestring = mHistoryEditor->appendTime(prepend_newline);
mHistoryEditor->appendTime(prepend_newline);
prepend_newline = false;
}
std::string show_name = name;
bool is_irc = false;
// 'name' is a sender name that we want to hotlink so that clicking on it opens a profile.
if (!name.empty()) // If name exists, then add it to the front of the message.
{
@@ -1658,40 +1659,36 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
}
else
{
std::string show_name = name;
// IRC style text starts with a colon here; empty names and system messages aren't irc style.
static const LLCachedControl<bool> italicize("LiruItalicizeActions");
is_irc = italicize && utf8msg[0] != ':';
if (source.notNull())
LLAvatarNameCache::getPNSName(source, show_name);
// Convert the name to a hotlink and add to message.
const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
LLStyleSP source_style = LLStyleMap::instance().lookupAgent(source);
source_style->mItalic = is_irc;
mHistoryEditor->appendStyledText(show_name,false,prepend_newline,source_style);
}
prepend_newline = false;
}
//Kadah - Bold group mods chat. Doesnt work on the first msg of the session, dont have speakers list yet?
if (gSavedSettings.getBOOL("SingularityBoldGroupModerator") && isModerator(source))
// Append the chat message in style
{
mHistoryEditor->appendColoredText(utf8msg.substr(0,1), false, prepend_newline, color);
LLStyleSP style(new LLStyle);
style->setVisible(true);
style->setColor(color);
style->setFontName(LLStringUtil::null);
style->mBold = TRUE;
mHistoryEditor->appendStyledText(utf8msg.substr(1), false, prepend_newline, style);
style->mItalic = is_irc;
style->mBold = gSavedSettings.getBOOL("SingularityBoldGroupModerator") && isModerator(source);
mHistoryEditor->appendStyledText(utf8msg, false, prepend_newline, style);
}
else
{
mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color);
}
if (log_to_file
&& gSavedPerAccountSettings.getBOOL("LogInstantMessages") )
{
std::string histstr;
if (gSavedPerAccountSettings.getBOOL("IMLogTimestamp"))
histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + utf8msg;
histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + show_name + utf8msg;
else
histstr = name + utf8msg;
histstr = show_name + utf8msg;
// [Ansariel: Display name support]
// Floater title contains display name -> bad idea to use that as filename
@@ -1706,7 +1703,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
mNumUnreadMessages++;
}
if (source != LLUUID::null)
if (source.notNull())
{
mSpeakers->speakerChatted(source);
mSpeakers->setSpeakerTyping(source, FALSE);
@@ -1722,12 +1719,6 @@ void LLFloaterIMPanel::setVisible(BOOL b)
if( b && hostp )
{
hostp->setFloaterFlashing(this, FALSE);
/* Don't change containing floater title - leave it "Instant Message" JC
LLUIString title = sTitleString;
title.setArg("[NAME]", mSessionLabel);
hostp->setTitle( title );
*/
}
}
@@ -2048,17 +2039,16 @@ void deliver_message(const std::string& utf8_text,
bool sent = false;
gAgent.buildFullname(name);
const LLRelationship* info = NULL;
info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id);
const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id);
U8 offline = (!info || info->isOnline()) ? IM_ONLINE : IM_OFFLINE;
if((offline == IM_OFFLINE) && (LLVoiceClient::getInstance()->isOnlineSIP(other_participant_id)))
{
// User is online through the OOW connector, but not with a regular viewer. Try to send the message via SLVoice.
sent = gVoiceClient->sendTextMessage(other_participant_id, utf8_text);
}
if(!sent)
{
// Send message normally.
@@ -2127,56 +2117,56 @@ void LLFloaterIMPanel::sendMsg()
// store sent line in history, duplicates will get filtered
if (mInputEditor) mInputEditor->updateHistory();
// Truncate and convert to UTF8 for transport
std::string utf8text = wstring_to_utf8str(text);
std::string utf8_text = wstring_to_utf8str(text);
// Convert MU*s style poses into IRC emotes here.
if (gSavedSettings.getBOOL("AscentAllowMUpose") && utf8text.length() > 3 && utf8text[0] == ':')
if (gSavedSettings.getBOOL("AscentAllowMUpose") && utf8_text.length() > 3 && utf8_text[0] == ':')
{
if (utf8text[1] == '\'')
if (utf8_text[1] == '\'')
{
utf8text.replace(0, 1, "/me");
utf8_text.replace(0, 1, "/me");
}
else if (isalpha(utf8text[1])) // Do not prevent smileys and such.
else if (isalpha(utf8_text[1])) // Do not prevent smileys and such.
{
utf8text.replace(0, 1, "/me ");
utf8_text.replace(0, 1, "/me ");
}
}
if (utf8text.find("/ME'") == 0 || utf8text.find("/ME ") == 0) //Allow CAPSlock /me
utf8text.replace(1, 2, "me");
std::string prefix = utf8text.substr(0, 4);
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1) && !mRPMode)
if (utf8_text.find("/ME'") == 0 || utf8_text.find("/ME ") == 0) //Allow CAPSlock /me
utf8_text.replace(1, 2, "me");
std::string prefix = utf8_text.substr(0, 4);
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8_text.length() > 1) && !mRPMode)
{
//Check if it needs the end-of-chat brackets -HgB
if (utf8text.find("((") == 0 && utf8text.find("))") == std::string::npos)
if (utf8_text.find("((") == 0 && utf8_text.find("))") == std::string::npos)
{
if(*utf8text.rbegin() == ')')
utf8text+=" ";
utf8text+="))";
if(*utf8_text.rbegin() == ')')
utf8_text+=" ";
utf8_text+="))";
}
else if(utf8text.find("[[") == 0 && utf8text.find("]]") == std::string::npos)
else if(utf8_text.find("[[") == 0 && utf8_text.find("]]") == std::string::npos)
{
if(*utf8text.rbegin() == ']')
utf8text+=" ";
utf8text+="]]";
if(*utf8_text.rbegin() == ']')
utf8_text+=" ";
utf8_text+="]]";
}
if (prefix != "/me " && prefix != "/me'") //Allow /me to end with )) or ]]
{
if (utf8text.find("((") == std::string::npos && utf8text.find("))") == (utf8text.length() - 2))
if (utf8_text.find("((") == std::string::npos && utf8_text.find("))") == (utf8_text.length() - 2))
{
if(utf8text[0] == '(')
utf8text.insert(0," ");
utf8text.insert(0,"((");
if(utf8_text[0] == '(')
utf8_text.insert(0," ");
utf8_text.insert(0,"((");
}
else if (utf8text.find("[[") == std::string::npos && utf8text.find("]]") == (utf8text.length() - 2))
else if (utf8_text.find("[[") == std::string::npos && utf8_text.find("]]") == (utf8_text.length() - 2))
{
if(utf8text[0] == '[')
utf8text.insert(0," ");
utf8text.insert(0,"[[");
if(utf8_text[0] == '[')
utf8_text.insert(0," ");
utf8_text.insert(0,"[[");
}
}
}
if (mRPMode && prefix != "/me " && prefix != "/me'")
utf8text = "[[" + utf8text + "]]";
utf8_text = "[[" + utf8_text + "]]";
// [RLVa:KB] - Checked: 2011-09-17 (RLVa-1.1.4b) | Modified: RLVa-1.1.4b
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) )
{
@@ -2203,7 +2193,7 @@ void LLFloaterIMPanel::sendMsg()
itSpeaker != speakers.end(); ++itSpeaker)
{
const LLSpeaker* pSpeaker = *itSpeaker;
if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.canSendIM(pSpeaker->mID)) )
if ( (gAgentID != pSpeaker->mID) && (!gRlvHandler.canSendIM(pSpeaker->mID)) )
{
fRlvFilter = true;
break;
@@ -2217,7 +2207,7 @@ void LLFloaterIMPanel::sendMsg()
}
if (fRlvFilter)
utf8text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
}
// [/RLVa:KB]
@@ -2226,7 +2216,7 @@ void LLFloaterIMPanel::sendMsg()
// Split messages that are too long, same code like in llimpanel.cpp
U32 split = MAX_MSG_BUF_SIZE - 1;
U32 pos = 0;
U32 total = utf8text.length();
U32 total = utf8_text.length();
while (pos < total)
{
@@ -2239,11 +2229,11 @@ void LLFloaterIMPanel::sendMsg()
else
{
// don't split utf-8 bytes
while (U8(utf8text[pos + next_split]) != 0x20 // space
&& U8(utf8text[pos + next_split]) != 0x21 // !
&& U8(utf8text[pos + next_split]) != 0x2C // ,
&& U8(utf8text[pos + next_split]) != 0x2E // .
&& U8(utf8text[pos + next_split]) != 0x3F // ?
while (U8(utf8_text[pos + next_split]) != 0x20 // space
&& U8(utf8_text[pos + next_split]) != 0x21 // !
&& U8(utf8_text[pos + next_split]) != 0x2C // ,
&& U8(utf8_text[pos + next_split]) != 0x2E // .
&& U8(utf8_text[pos + next_split]) != 0x3F // ?
&& next_split > 0)
{
--next_split;
@@ -2260,7 +2250,7 @@ void LLFloaterIMPanel::sendMsg()
}
}
std::string send = utf8text.substr(pos, next_split);
std::string send = utf8_text.substr(pos, next_split);
pos += next_split;
LL_WARNS("Splitting") << "Pos: " << pos << " next_split: " << next_split << LL_ENDL;
@@ -2274,37 +2264,30 @@ LL_WARNS("Splitting") << "Pos: " << pos << " next_split: " << next_split << LL_E
if((mDialog == IM_NOTHING_SPECIAL) &&
(mOtherParticipantUUID.notNull()))
{
std::string history_echo;
gAgent.buildFullname(history_echo);
std::string name;
gAgent.buildFullname(name);
// Look for IRC-style emotes here.
std::string prefix = utf8text.substr(0, 4);
std::string prefix = utf8_text.substr(0, 4);
if (prefix == "/me " || prefix == "/me'")
{
utf8text.replace(0,3,"");
utf8_text.replace(0,3,"");
}
else
{
history_echo += ": ";
}
history_echo += utf8text;
BOOL other_was_typing = mOtherTyping;
addHistoryLine(history_echo, gSavedSettings.getColor("IMChatColor"), true, gAgent.getID());
if (other_was_typing)
{
addTypingIndicator(mOtherTypingName);
utf8_text.insert(0, ": ");
}
bool other_was_typing = mOtherTyping;
addHistoryLine(utf8_text, gSavedSettings.getColor("UserChatColor"), true, gAgentID, name);
if (other_was_typing) addTypingIndicator(mOtherTypingName);
}
}
else
{
//queue up the message to send once the session is
//initialized
mQueuedMsgsForInit.append(utf8text);
mQueuedMsgsForInit.append(utf8_text);
}
}
@@ -2441,6 +2424,7 @@ void LLFloaterIMPanel::sendTypingState(BOOL typing)
gAgent.sendReliableMessage();
}
void LLFloaterIMPanel::processIMTyping(const LLIMInfo* im_info, BOOL typing)
{
if (typing)
@@ -2584,12 +2568,11 @@ bool LLFloaterIMPanel::onConfirmForceCloseError(const LLSD& notification, const
//only 1 option really
LLUUID session_id = notification["payload"]["session_id"];
if ( gIMMgr )
if (gIMMgr)
{
LLFloaterIMPanel* floaterp = gIMMgr->findFloaterBySession(
session_id);
LLFloaterIMPanel* floaterp = gIMMgr->findFloaterBySession(session_id);
if ( floaterp ) floaterp->close(FALSE);
if (floaterp) floaterp->close(FALSE);
}
return false;
}
@@ -2608,29 +2591,20 @@ const bool LLFloaterIMPanel::isModerator(const LLUUID& speaker_id)
BOOL LLFloaterIMPanel::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash )
{
LLView* chat_editor = getChildView("chat_editor");
if (getVisible() && childIsVisible("chat_editor"))
{
gFocusMgr.setKeyboardFocus(chat_editor);
if (getVisible() && mInputEditor->getVisible())
{
setInputFocus(true);
return TRUE;
}
LLUICtrl * ctrl = static_cast<LLUICtrl*>(chat_editor);
ctrl->setFocus(TRUE);
return TRUE;
}
return LLUICtrl::focusFirstItem(prefer_text_fields, focus_flash);
return LLUICtrl::focusFirstItem(prefer_text_fields, focus_flash);
}
void LLFloaterIMPanel::onFocusReceived()
{
LLView* chat_editor = getChildView("chat_editor");
if (getVisible() && childIsVisible("chat_editor"))
if (getVisible() && mInputEditor->getVisible())
{
gFocusMgr.setKeyboardFocus(chat_editor);
LLUICtrl * ctrl = static_cast<LLUICtrl*>(chat_editor);
ctrl->setFocus(TRUE);
setInputFocus(true);
}
LLFloater::onFocusReceived();

7
indra/newview/llimview.cpp
View File

@@ -1436,7 +1436,7 @@ public:
floaterp->processSessionUpdate(body["session_info"]);
}
//aply updates we've possibly received previously
//apply updates we've possibly received previously
floaterp->updateSpeakersList(
gIMMgr->getPendingAgentListUpdates(session_id));
}
@@ -1614,8 +1614,9 @@ public:
{
separator_string = "";
message_offset = 3;
chat.mChatStyle = CHAT_STYLE_IRC;
}
chat.mMuted = is_muted && !is_linden;
chat.mFromID = from_id;
chat.mFromName = name;
@@ -1719,7 +1720,7 @@ public:
{
return;
}
if(!LLVoiceClient::voiceEnabled())
{
// Don't display voice invites unless the user has voice enabled.

4
indra/newview/llmenucommands.cpp
View File

@@ -75,7 +75,7 @@ void handle_track_avatar(const LLUUID& agent_id, const std::string& name)
LLAvatarTracker::instance().track(agent_id, name);
LLFloaterDirectory::hide(NULL);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
void handle_pay_by_id(const LLUUID& agent_id)
@@ -92,7 +92,7 @@ void handle_mouselook(void*)
void handle_map(void*)
{
LLFloaterWorldMap::toggle(NULL);
LLFloaterWorldMap::toggle();
}
void handle_mini_map(void*)

8
indra/newview/llnetmap.cpp
View File

@@ -955,7 +955,7 @@ BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
{
LLVector3d pos_global = viewPosToGlobal(x, y, gSavedSettings.getBOOL( "MiniMapRotate" ));
BOOL new_target = FALSE;
if (!LLTracker::isTracking(NULL))
if (!LLTracker::isTracking())
{
gFloaterWorldMap->trackLocation(pos_global);
new_target = TRUE;
@@ -967,7 +967,7 @@ BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
}
else
{
LLFloaterWorldMap::show(NULL, new_target);
LLFloaterWorldMap::show(new_target);
}
return TRUE;
}
@@ -1108,14 +1108,14 @@ bool LLNetMap::LLCheckRotateMap::handleEvent(LLPointer<LLEvent> event, const LLS
bool LLNetMap::LLStopTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
return true;
}
bool LLNetMap::LLEnableTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLNetMap *self = mPtr;
self->findControl(userdata["control"].asString())->setValue(LLTracker::isTracking(NULL));
self->findControl(userdata["control"].asString())->setValue(LLTracker::isTracking());
return true;
}

35
indra/newview/llpanelavatar.cpp
View File

@@ -70,11 +70,8 @@
#include "llstatusbar.h"
#include "lltabcontainer.h"
#include "llimview.h"
#include "lltooldraganddrop.h"
#include "lluiconstants.h"
#include "llvoavatar.h"
#include "llviewercontrol.h"
#include "llviewermenu.h" // *FIX: for is_agent_friend()
#include "llviewergenericmessage.h" // send_generic_message
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
@@ -82,7 +79,6 @@
#include "llinventorymodel.h"
#include "roles_constants.h"
#include "lluictrlfactory.h"
#include "llviewermenu.h"
#include "llavatarnamecache.h"
#include "lldroptarget.h"
@@ -105,6 +101,8 @@ BOOL LLPanelAvatar::sAllowFirstLife = FALSE;
extern void callback_invite_to_group(LLUUID group_id, void *user_data);
extern void handle_lure(const LLUUID& invitee);
extern void handle_pay_by_id(const LLUUID& payee);
BOOL is_agent_friend(const LLUUID& agent_id);
BOOL is_agent_mappable(const LLUUID& agent_id);
//-----------------------------------------------------------------------------
@@ -1434,7 +1432,6 @@ LLPanelAvatar::LLPanelAvatar(
mPanelNotes(NULL),
mPanelFirstLife(NULL),
mPanelWeb(NULL),
mDropTarget(NULL),
mAvatarID( LLUUID::null ), // mAvatarID is set with 'setAvatar' or 'setAvatarID'
mHaveProperties(FALSE),
mHaveStatistics(FALSE),
@@ -1595,16 +1592,16 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
{
if (avatar_id.isNull()) return;
BOOL avatar_changed = FALSE;
//BOOL avatar_changed = FALSE;
if (avatar_id != mAvatarID)
{
avatar_changed = TRUE;
//avatar_changed = TRUE;
if(mAvatarID.notNull())
{
LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
}
mAvatarID = avatar_id;
}
mAvatarID = avatar_id;
LLAvatarPropertiesProcessor::getInstance()->addObserver(mAvatarID, this);
@@ -1628,18 +1625,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
// Teens don't have this.
if (mPanelFirstLife) mPanelFirstLife->enableControls(own_avatar && mAllowEdit);
LLView *target_view = getChild<LLView>("drop_target_rect");
if(target_view)
{
if (mDropTarget)
{
delete mDropTarget;
}
mDropTarget = new LLDropTarget("drop target", target_view->getRect(), mAvatarID);
addChild(mDropTarget);
mDropTarget->setAgentID(mAvatarID);
}
getChild<LLDropTarget>("drop_target_rect")->setEntityID(mAvatarID);
LLNameEditor* name_edit = getChild<LLNameEditor>("name");
if(name_edit)
{
@@ -1726,8 +1713,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
childSetEnabled("Mute",FALSE);
childSetVisible("Offer Teleport...",FALSE);
childSetEnabled("Offer Teleport...",FALSE);
childSetVisible("drop target",FALSE);
childSetEnabled("drop target",FALSE);
childSetVisible("Find on Map",FALSE);
childSetEnabled("Find on Map",FALSE);
childSetVisible("Add Friend...",FALSE);
@@ -1750,8 +1735,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
childSetVisible("Mute",TRUE);
childSetEnabled("Mute",FALSE);
childSetVisible("drop target",TRUE);
childSetEnabled("drop target",FALSE);
childSetVisible("Find on Map",TRUE);
// Note: we don't always know online status, so always allow gods to try to track
@@ -1914,7 +1897,7 @@ void LLPanelAvatar::onClickTrack(void* userdata)
LLNameEditor* nameedit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
if (nameedit) name = nameedit->getText();
gFloaterWorldMap->trackAvatar(self->mAvatarID, name);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
}
@@ -2077,8 +2060,6 @@ void LLPanelAvatar::processProperties(void* data, EAvatarProcessorType type)
childSetEnabled("Pay...",TRUE);
childSetEnabled("Mute",TRUE);
childSetEnabled("drop target",TRUE);
mHaveProperties = TRUE;
enableOKIfReady();

2
indra/newview/llpanelavatar.h
View File

@@ -373,8 +373,6 @@ public:
std::list<LLPanelAvatarTab*> mAvatarPanelList;
LLDropTarget* mDropTarget;
// Teen users are not allowed to see or enter data into the first life page,
// or their own about/interests text entry fields.
static BOOL sAllowFirstLife;

2
indra/newview/llpanelclassified.cpp
View File

@@ -886,7 +886,7 @@ void LLPanelClassified::onClickMap(void* data)
{
LLPanelClassified* self = (LLPanelClassified*)data;
gFloaterWorldMap->trackLocation(self->mPosGlobal);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
self->sendClassifiedClickMessage("map");
}

2
indra/newview/llpanelevent.cpp
View File

@@ -229,7 +229,7 @@ void LLPanelEvent::onClickMap(void* data)
if (!self->mEventInfo.mPosGlobal.isExactlyZero())
{
gFloaterWorldMap->trackLocation(self->mEventInfo.mPosGlobal);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
}

2
indra/newview/llpanelgrouplandmoney.cpp
View File

@@ -248,7 +248,7 @@ void LLPanelGroupLandMoney::impl::onMapButton()
LLVector3d pos_global(global_x, global_y, global_z);
gFloaterWorldMap->trackLocation(pos_global);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
bool LLPanelGroupLandMoney::impl::applyContribution()

54
indra/newview/llpanelgroupnotices.cpp
View File

@@ -66,20 +66,17 @@ const S32 NOTICE_DATE_STRING_SIZE = 30;
/////////////////////////
// LLPanelGroupNotices //
/////////////////////////
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLDropTarget
//
// This handy class is a simple way to drop something on another
// view. It handles drop events, always setting itself to the size of
// its parent.
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
class LLGroupDropTarget : public LLView
#include "lldroptarget.h"
class LLGroupDropTarget : public LLDropTarget
{
public:
LLGroupDropTarget(const std::string& name, const LLRect& rect, LLPanelGroupNotices* panel, const LLUUID& group_id);
LLGroupDropTarget(const LLDropTarget::Params& p = LLDropTarget::Params());
~LLGroupDropTarget() {};
void doDrop(EDragAndDropType cargo_type, void* cargo_data);
//
// LLDropTarget functionality
virtual void doDrop(EDragAndDropType cargo_type, void* cargo_data);
//
// LLView functionality
@@ -88,19 +85,26 @@ public:
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
static LLView* fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory);
void setGroupNoticesPanel(LLPanelGroupNotices* panel) { mGroupNoticesPanel = panel; }
protected:
LLPanelGroupNotices* mGroupNoticesPanel;
LLUUID mGroupID;
};
LLGroupDropTarget::LLGroupDropTarget(const std::string& name, const LLRect& rect,
LLPanelGroupNotices* panel, const LLUUID& group_id) :
LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
mGroupNoticesPanel(panel),
mGroupID(group_id)
LLGroupDropTarget::LLGroupDropTarget(const LLDropTarget::Params& p)
: LLDropTarget(p)
{
}
// static
LLView* LLGroupDropTarget::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory* factory)
{
LLGroupDropTarget* target = new LLGroupDropTarget();
target->initFromXML(node, parent);
return target;
}
void LLGroupDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
{
llinfos << "LLGroupDropTarget::doDrop()" << llendl;
@@ -114,7 +118,7 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
{
BOOL handled = FALSE;
if (!gAgent.hasPowerInGroup(mGroupID,GP_NOTICES_SEND))
if (!gAgent.hasPowerInGroup(mEntityID,GP_NOTICES_SEND))
{
*accept = ACCEPT_NO;
return TRUE;
@@ -172,6 +176,8 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
return handled;
}
static LLRegisterWidget<LLGroupDropTarget> r("group_drop_target");
//-----------------------------------------------------------------------------
// LLPanelGroupNotices
//-----------------------------------------------------------------------------
@@ -264,17 +270,9 @@ BOOL LLPanelGroupNotices::postBuild()
mPanelCreateNotice = getChild<LLPanel>("panel_create_new_notice",recurse);
mPanelViewNotice = getChild<LLPanel>("panel_view_past_notice",recurse);
// Must be in front of all other UI elements.
LLPanel* dtv = getChild<LLPanel>("drop_target",recurse);
LLGroupDropTarget* target = new LLGroupDropTarget("drop_target",
dtv->getRect(),
this, mGroupID);
target->setEnabled(TRUE);
target->setToolTip(dtv->getToolTip());
mPanelCreateNotice->addChild(target);
mPanelCreateNotice->removeChild(dtv);
delete dtv;
LLGroupDropTarget* group_drop_target = getChild<LLGroupDropTarget>("drop_target",recurse);
group_drop_target->setEntityID(mGroupID);
group_drop_target->setGroupNoticesPanel(this);
arrangeNoticeView(VIEW_PAST_NOTICE);

2
indra/newview/llpanelpick.cpp
View File

@@ -507,7 +507,7 @@ void LLPanelPick::onClickMap(void* data)
{
LLPanelPick* self = (LLPanelPick*)data;
gFloaterWorldMap->trackLocation(self->mPosGlobal);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
// static

2
indra/newview/llpanelplace.cpp
View File

@@ -384,7 +384,7 @@ void LLPanelPlace::onClickMap(void* data)
if (!self->mPosGlobal.isExactlyZero())
{
gFloaterWorldMap->trackLocation(self->mPosGlobal);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
}
}

27
indra/newview/llprefsim.cpp
View File

@@ -114,15 +114,12 @@ BOOL LLPrefsIMImpl::postBuild()
childDisable("log_chat");
childDisable("log_show_history");
//childDisable("log_path_button");
childDisable("busy_response");
childDisable("log_instant_messages_timestamp");
childDisable("log_chat_timestamp");
childDisable("log_chat_IM");
childDisable("log_date_timestamp");
childDisable("logfile_name_datestamp");
childSetText("busy_response", getString("log_in_to_change"));
childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
@@ -147,7 +144,6 @@ BOOL LLPrefsIMImpl::postBuild()
void LLPrefsIMImpl::enableHistory()
{
if (childGetValue("log_instant_messages").asBoolean() || childGetValue("log_chat").asBoolean())
{
childEnable("log_show_history");
@@ -162,18 +158,8 @@ void LLPrefsIMImpl::enableHistory()
void LLPrefsIMImpl::apply()
{
LLTextEditor* busy = getChild<LLTextEditor>("busy_response");
LLWString busy_response;
if (busy) busy_response = busy->getWText();
LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
LLWStringUtil::replaceChar(busy_response, '\n', '^');
LLWStringUtil::replaceChar(busy_response, ' ', '%');
if(mGotPersonalInfo)
{
gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
@@ -272,24 +258,11 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
childSetValue("send_im_to_email", im_via_email);
childEnable("log_instant_messages");
childEnable("log_chat");
childEnable("busy_response");
childEnable("log_instant_messages_timestamp");
childEnable("log_chat_timestamp");
childEnable("log_chat_IM");
childEnable("log_date_timestamp");
childEnable("logfile_name_datestamp");
//RN: get wide string so replace char can work (requires fixed-width encoding)
LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );
LLWStringUtil::replaceChar(busy_response, '^', '\n');
LLWStringUtil::replaceChar(busy_response, '%', ' ');
childSetText("busy_response", wstring_to_utf8str(busy_response));
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
{
childDisable("busy_response");
}
// [/RLVa:KB]
enableHistory();

17
indra/newview/llstylemap.cpp
View File

@@ -33,10 +33,6 @@
#include "llviewerprecompiledheaders.h"
#include "llstylemap.h"
#include "llstring.h"
#include "llui.h"
#include "llviewercontrol.h"
#include "llagent.h"
LLStyleMap::LLStyleMap()
{
@@ -60,19 +56,12 @@ const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
if (find(source) == end())
{
LLStyleSP style(new LLStyle);
style->setVisible(true);
style->setFontName(LLStringUtil::null);
if (source != LLUUID::null && source != gAgent.getID() )
if (source.notNull())
{
style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
style->setLinkHREF(link);
}
else
{
// Make the resident's own name white and don't make the name clickable.
style->setColor(LLColor4::white);
}
(*this)[source] = style;
}
return (*this)[source];
@@ -86,9 +75,7 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
if (iter == end())
{
LLStyleSP style(new LLStyle);
style->setVisible(true);
style->setFontName(LLStringUtil::null);
if (id != LLUUID::null && !link.empty())
if (id.notNull() && !link.empty())
{
style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
style->setLinkHREF(link);

3
indra/newview/lltracker.cpp
View File

@@ -111,9 +111,8 @@ LLTracker::~LLTracker()
// static
void LLTracker::stopTracking(void* userdata)
void LLTracker::stopTracking(bool clear_ui)
{
BOOL clear_ui = ((BOOL)(intptr_t)userdata);
instance()->stopTrackingAll(clear_ui);
}

4
indra/newview/lltracker.h
View File

@@ -81,8 +81,8 @@ public:
// these are static so that they can be used a callbacks
static ETrackingStatus getTrackingStatus() { return instance()->mTrackingStatus; }
static ETrackingLocationType getTrackedLocationType() { return instance()->mTrackingLocationType; }
static BOOL isTracking(void*) { return instance()->mTrackingStatus != TRACKING_NOTHING; }
static void stopTracking(void*);
static BOOL isTracking() { return instance()->mTrackingStatus != TRACKING_NOTHING; }
static void stopTracking(bool);
static void clearFocus();
static const LLUUID& getTrackedLandmarkAssetID() { return instance()->mTrackedLandmarkAssetID; }

2
indra/newview/llviewermenu.cpp
View File

@@ -6478,7 +6478,7 @@ class LLShowFloater : public view_listener_t
}
else if (floater_name == "world map")
{
LLFloaterWorldMap::toggle(NULL);
LLFloaterWorldMap::toggle();
}
else if (floater_name == "mini map")
{

530
indra/newview/llviewermessage.cpp
View File

@@ -31,6 +31,7 @@
#include "llviewerprecompiledheaders.h"
#include "llviewermessage.h"
#include <boost/algorithm/string/replace.hpp>
#include <boost/lexical_cast.hpp>
#include "llanimationstates.h"
@@ -1949,6 +1950,28 @@ void god_message_name_cb(const LLAvatarName& av_name, LLChat chat, std::string m
}
// Replace wild cards in autoresponse messages
std::string replace_wildcards(std::string autoresponse, const LLUUID& id, const std::string& name)
{
// Add in their legacy name
boost::algorithm::replace_all(autoresponse, "#n", name);
// Add in our location's slurl
boost::algorithm::replace_all(autoresponse, "#r", gAgent.getSLURL());
// Add in their display name
LLAvatarName av_name;
boost::algorithm::replace_all(autoresponse, "#d", LLAvatarNameCache::get(id, &av_name) ? av_name.mDisplayName : name);
if (!isAgentAvatarValid()) return autoresponse;
// Add in idle time
LLStringUtil::format_map_t args;
args["[MINS]"] = boost::lexical_cast<std::string, int>(gAgentAvatarp->mIdleTimer.getElapsedTimeF32()/60);
boost::algorithm::replace_all(autoresponse, "#i", LLTrans::getString("IM_autoresponse_minutes", args));
return autoresponse;
}
void process_improved_im(LLMessageSystem *msg, void **user_data)
{
if (gNoRender)
@@ -2018,11 +2041,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
return;
// NaCl End
// make sure that we don't have an empty or all-whitespace name
// make sure that we don't have an empty or all-whitespace name
LLStringUtil::trim(name);
if (name.empty())
{
name = LLTrans::getString("Unnamed");
name = LLTrans::getString("Unnamed");
}
// Preserve the unaltered name for use in group notice mute checking.
@@ -2032,7 +2055,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
name = clean_name_from_im(name, dialog);
// <edit>
llinfos << "RegionID: " << region_id.asString() << llendl;
if (region_id.notNull())
llinfos << "RegionID: " << region_id.asString() << llendl;
// </edit>
BOOL is_busy = gAgent.getBusy();
@@ -2042,7 +2066,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
BOOL is_owned_by_me = FALSE;
BOOL is_friend = (LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL) ? false : true;
BOOL accept_im_from_only_friend = gSavedSettings.getBOOL("VoiceCallsFriendsOnly");
BOOL accept_im_from_only_friend = gSavedSettings.getBOOL("InstantMessagesFriendsOnly");
LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
@@ -2066,238 +2090,24 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
std::string separator_string(": ");
int message_offset = 0;
//Handle IRC styled /me messages.
//Handle IRC styled /me messages.
std::string prefix = message.substr(0, 4);
if (prefix == "/me " || prefix == "/me'")
{
chat.mChatStyle = CHAT_STYLE_IRC;
separator_string = "";
message_offset = 3;
}
if( dialog == IM_TYPING_START
|| dialog == IM_NOTHING_SPECIAL
|| dialog == IM_TYPING_STOP
|| dialog == IM_BUSY_AUTO_RESPONSE)
{
if(session_id != computed_session_id)
{
session_id = computed_session_id;
}
}
bool typing_init = false;
if( dialog == IM_TYPING_START && !is_muted )
{
if(!gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
{
typing_init = true;
gIMMgr->addMessage(
computed_session_id,
from_id,
name,
llformat("%s ",name.c_str()) + LLTrans::getString("IM_announce_incoming"),
name,
IM_NOTHING_SPECIAL,
parent_estate_id,
region_id,
position,
false);
}
}
bool is_auto_response = false;
if(dialog == IM_NOTHING_SPECIAL) {
// detect auto responses from GreenLife and compatible viewers
is_auto_response = ( message.substr(0, 21) == "/me (auto-response): " );
}
bool do_auto_response = false;
if( gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone" ) )
do_auto_response = true;
// odd name for auto respond to non-friends
if( gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends") &&
LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL )
do_auto_response = true;
if( is_muted )
do_auto_response = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
if( offline != IM_ONLINE )
do_auto_response = false;
if( is_auto_response )
do_auto_response = false;
// handle cases where IM_NOTHING_SPECIAL is not an IM
if( name == SYSTEM_FROM ||
from_id.isNull() ||
to_id.isNull() )
do_auto_response = false;
// if( do_auto_response )
// [RLVa:KB] - Alternate: Phoenix-370
// Phoenix specific: auto-response should be blocked if the avie is RLV @sendim=n restricted and the recipient is not an exception
if ( (do_auto_response) && ( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.isException(RLV_BHVR_SENDIM, from_id)) ) )
// [/RLVa:KB]
{
if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) ||
(dialog == IM_TYPING_START && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
)
{
BOOL has = gIMMgr->hasSession(computed_session_id);
if(!has || gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat") || typing_init)
{
BOOL show = !gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded");
if(!has && show)
{
gIMMgr->addSession(name, IM_NOTHING_SPECIAL, from_id);
}
if(show)
{
gIMMgr->addMessage(
computed_session_id,
from_id,
SYSTEM_FROM,
LLTrans::getString("IM_autoresponded_to") + llformat(" %s.",name.c_str()),
LLStringUtil::null,
IM_NOTHING_SPECIAL,
parent_estate_id,
region_id,
position,
false);
}
std::string my_name;
gAgent.buildFullname(my_name);
//<-- Personalized Autoresponse by Madgeek
std::string autoresponse = gSavedPerAccountSettings.getText("AscentInstantMessageResponse");
//Define Wildcards
std::string fname_wildcard = "#f";
std::string lname_wildcard = "#l";
std::string time_wildcard = "#t";
std::string region_wildcard = "#r";
std::string idle_wildcard = "#i";
//Extract Name
std::string f_name, l_name;
std::istringstream inname(name);
inname >> f_name >> l_name;
//Generate a Timestamp
time_t rawtime;
time(&rawtime);
char * timestamp_chars;
timestamp_chars = asctime(localtime(&rawtime));
std::string timestamp;
timestamp.assign(timestamp_chars);
timestamp = timestamp.substr(0, timestamp.find('\n'));
//Generate slurl
std::string slrul = gAgent.getSLURL();
//Generate idle time
LLVOAvatar* myavatar = gAgentAvatarp;
std::string idle_time = "";
if(myavatar)idle_time = llformat("%d mins", (U8)(myavatar->mIdleTimer.getElapsedTimeF32()/60.));
//Handle Replacements
size_t found = autoresponse.find(fname_wildcard);
while(found != std::string::npos)
{
autoresponse.replace(found, 2, f_name);
found = autoresponse.find(fname_wildcard);
}
found = autoresponse.find(lname_wildcard);
while(found != std::string::npos)
{
autoresponse.replace(found, 2, l_name);
found = autoresponse.find(lname_wildcard);
}
found = autoresponse.find(time_wildcard);
while(found != std::string::npos)
{
autoresponse.replace(found, 2, timestamp);
found = autoresponse.find(time_wildcard);
}
found = autoresponse.find(region_wildcard);
while(found != std::string::npos)
{
autoresponse.replace(found, 2, slrul);
found = autoresponse.find(region_wildcard);
}
found = autoresponse.find(idle_wildcard);
while(found != std::string::npos)
{
autoresponse.replace(found, 2, idle_time);
found = autoresponse.find(idle_wildcard);
}
//--> Personalized Autoresponse
if(gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat") && has && !typing_init) {
// send as busy auto response instead to prevent endless repeating replies
// when other end is a bot or broken client that answers to every usual IM
// reasoning for this decision can be found in RFC2812 3.3.2 Notices
// where PRIVMSG can be seen as IM_NOTHING_SPECIAL and NOTICE can be seen as
// IM_BUSY_AUTO_RESPONSE. The assumption here is that no existing client
// responds to IM_BUSY_AUTO_RESPONSE. --TS
std::string response = autoresponse;
pack_instant_message(
gMessageSystem,
gAgent.getID(),
FALSE,
gAgent.getSessionID(),
from_id,
my_name,
response,
IM_OFFLINE,
IM_BUSY_AUTO_RESPONSE,
session_id);
} else {
std::string response = "/me (auto-response): "+autoresponse;
pack_instant_message(
gMessageSystem,
gAgent.getID(),
FALSE,
gAgent.getSessionID(),
from_id,
my_name,
response,
IM_OFFLINE,
IM_NOTHING_SPECIAL,
session_id);
}
gAgent.sendReliableMessage();
if(gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem") && (!has || typing_init))
{
LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("AscentInstantMessageResponseItemData");
LLViewerInventoryItem* item = gInventory.getItem(itemid);
if(item)
{
//childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
if(show)
{
gIMMgr->addMessage(
computed_session_id,
from_id,
SYSTEM_FROM,
llformat("%s %s \"%s\"",name.c_str(), LLTrans::getString("IM_autoresponse_sent_item").c_str(), item->getName().c_str()),
LLStringUtil::null,
IM_NOTHING_SPECIAL,
parent_estate_id,
region_id,
position,
false);
}
LLGiveInventory::doGiveInventoryItem(from_id, item, computed_session_id);
}
}
}
}
}
// These bools are here because they would make mess of logic down below in IM_NOTHING_SPECIAL.
bool is_autorespond = !is_muted && (is_friend || !gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneFriendsOnly")) && gSavedPerAccountSettings.getBOOL("AutoresponseAnyone");
bool is_autorespond_muted = is_muted && gSavedPerAccountSettings.getBOOL("AutoresponseMuted");
bool is_autorespond_nonfriends = !is_friend && !is_muted && gSavedPerAccountSettings.getBOOL("AutoresponseNonFriends");
LLSD args;
switch(dialog)
{
case IM_CONSOLE_AND_CHAT_HISTORY:
// These are used for system messages, hence don't need the name,
// as it is always "Second Life".
// *TODO:translate
args["MESSAGE"] = message;
// Note: don't put the message in the IM history, even though was sent
@@ -2305,7 +2115,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLNotificationsUtil::add("SystemMessageTip",args);
break;
case IM_NOTHING_SPECIAL:
case IM_NOTHING_SPECIAL:
// Don't show dialog, just do IM
if (!gAgent.isGodlike()
&& gAgent.getRegion()->isPrelude()
@@ -2326,37 +2136,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// [/RLVa:KB]
// else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) && (gRlvHandler.canReceiveIM(from_id)) )
else if (offline == IM_ONLINE && !is_linden && (is_busy || is_autorespond || is_autorespond_nonfriends || is_autorespond_muted) && name != SYSTEM_FROM && gRlvHandler.canReceiveIM(from_id))
// [/RLVa:KB]
{
// return a standard "busy" message, but only do it to online IM
// (i.e. not other auto responses and not store-and-forward IM)
if (!gIMMgr->hasSession(session_id))
{
// if there is not a panel for this conversation (i.e. it is a new IM conversation
// initiated by the other party) then...
std::string my_name;
LLAgentUI::buildFullname(my_name);
std::string response = gSavedPerAccountSettings.getText("BusyModeResponse");
pack_instant_message(
gMessageSystem,
gAgent.getID(),
FALSE,
gAgent.getSessionID(),
from_id,
my_name,
response,
IM_ONLINE,
IM_BUSY_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
}
// now store incoming IM in chat history
buffer = separator_string + message.substr(message_offset);
LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
bool send_autoresponse = !gIMMgr->hasSession(session_id) || gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat");
// add to IM panel, but do not bother the user
gIMMgr->addMessage(
@@ -2374,6 +2162,76 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// pretend this is chat generated by self, so it does not show up on screen
chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
LLFloaterChat::addChat( chat, TRUE, TRUE );
// return a standard "busy" message, but only do it to online IM
// (i.e. not other auto responses and not store-and-forward IM)
if (send_autoresponse)
{
// if there is not a panel for this conversation (i.e. it is a new IM conversation
// initiated by the other party) then...
std::string my_name;
LLAgentUI::buildFullname(my_name);
std::string response;
bool show_autoresponded = false;
LLUUID itemid;
if (is_muted)
{
response = gSavedPerAccountSettings.getString("AutoresponseMutedMessage");
if (gSavedPerAccountSettings.getBOOL("AutoresponseMutedItem"))
itemid = static_cast<LLUUID>(gSavedPerAccountSettings.getString("AutoresponseMutedItemID"));
// We don't show that we've responded to mutes
}
else if (is_busy)
{
response = gSavedPerAccountSettings.getString("BusyModeResponse");
if (gSavedPerAccountSettings.getBOOL("BusyModeResponseItem"))
itemid = static_cast<LLUUID>(gSavedPerAccountSettings.getString("BusyModeResponseItemID"));
show_autoresponded = gSavedPerAccountSettings.getBOOL("BusyModeResponseShow");
}
else if (is_autorespond_nonfriends)
{
response = gSavedPerAccountSettings.getString("AutoresponseNonFriendsMessage");
if (gSavedPerAccountSettings.getBOOL("AutoresponseNonFriendsItem"))
itemid = static_cast<LLUUID>(gSavedPerAccountSettings.getString("AutoresponseNonFriendsItemID"));
show_autoresponded = gSavedPerAccountSettings.getBOOL("AutoresponseNonFriendsShow");
}
else if (is_autorespond)
{
response = gSavedPerAccountSettings.getString("AutoresponseAnyoneMessage");
if (gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneItem"))
itemid = static_cast<LLUUID>(gSavedPerAccountSettings.getString("AutoresponseAnyoneItemID"));
show_autoresponded = gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneShow");
}
pack_instant_message(
gMessageSystem,
gAgentID,
FALSE,
gAgent.getSessionID(),
from_id,
my_name,
replace_wildcards(response, from_id, name),
IM_ONLINE,
IM_BUSY_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
std::string pns_name;
if (!LLAvatarNameCache::getPNSName(from_id, pns_name)) pns_name = name;
if (show_autoresponded)
{
gIMMgr->addMessage(session_id, from_id, LLStringUtil::null, LLTrans::getString("IM_autoresponded_to") + " " + pns_name);
}
if (LLViewerInventoryItem* item = gInventory.getItem(itemid))
{
LLGiveInventory::doGiveInventoryItem(from_id, item, computed_session_id);
if (show_autoresponded)
{
gIMMgr->addMessage(computed_session_id, from_id, LLStringUtil::null,
llformat("%s %s \"%s\"", pns_name.c_str(), LLTrans::getString("IM_autoresponse_sent_item").c_str(), item->getName().c_str()));
}
}
}
// We stored the incoming IM in history before autoresponding, logically.
}
else if (from_id.isNull())
{
@@ -2446,9 +2304,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
position,
true);
chat.mText = std::string("IM: ") + name + separator_string + saved + message.substr(message_offset);
BOOL local_agent = FALSE;
LLFloaterChat::addChat( chat, TRUE, local_agent );
LLFloaterChat::addChat(chat, true, false);
}
else
{
@@ -2456,14 +2312,94 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// history. Pretend the chat is from a local agent,
// so it will go into the history but not be shown on screen.
chat.mText = buffer;
BOOL local_agent = TRUE;
LLFloaterChat::addChat( chat, TRUE, local_agent );
LLFloaterChat::addChat(chat, true, true);
// Autoresponse to muted avatars
if (gSavedPerAccountSettings.getBOOL("AutoresponseMuted"))
{
std::string my_name;
LLAgentUI::buildFullname(my_name);
pack_instant_message(
gMessageSystem,
gAgentID,
FALSE,
gAgent.getSessionID(),
from_id,
my_name,
replace_wildcards(gSavedPerAccountSettings.getString("AutoresponseMutedMessage"), from_id, name),
IM_ONLINE,
IM_BUSY_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
if (gSavedPerAccountSettings.getBOOL("AutoresponseMutedItem"))
if (LLViewerInventoryItem* item = gInventory.getItem(static_cast<LLUUID>(gSavedPerAccountSettings.getString("AutoresponseMutedItemID"))))
LLGiveInventory::doGiveInventoryItem(from_id, item, computed_session_id);
}
}
}
break;
case IM_TYPING_START:
{
// Don't announce that someone has started messaging, if they're muted or when in busy mode
if (!is_muted && (!accept_im_from_only_friend || is_friend) && !is_busy && !gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
{
std::string pns_name;
if (!LLAvatarNameCache::getPNSName(from_id, pns_name)) pns_name = name;
gIMMgr->addMessage(
computed_session_id,
from_id,
name,
llformat("%s ", pns_name.c_str()) + LLTrans::getString("IM_announce_incoming"),
name,
IM_NOTHING_SPECIAL,
parent_estate_id,
region_id,
position,
false);
// This block is very similar to the one above, but is necessary, since a session is opened to announce incoming message..
// In order to prevent doubling up on the first response, We neglect to send this if Repeat for each message is on.
if ((is_autorespond_nonfriends || is_autorespond) && !gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat"))
{
std::string my_name;
LLAgentUI::buildFullname(my_name);
std::string response;
bool show_autoresponded = false;
LLUUID itemid;
if (is_autorespond_nonfriends)
{
response = gSavedPerAccountSettings.getString("AutoresponseNonFriendsMessage");
if (gSavedPerAccountSettings.getBOOL("AutoresponseNonFriendsItem"))
itemid = static_cast<LLUUID>(gSavedPerAccountSettings.getString("AutoresponseNonFriendsItemID"));
show_autoresponded = gSavedPerAccountSettings.getBOOL("AutoresponseNonFriendsShow");
}
else if (is_autorespond)
{
response = gSavedPerAccountSettings.getString("AutoresponseAnyoneMessage");
if (gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneItem"))
itemid = static_cast<LLUUID>(gSavedPerAccountSettings.getString("AutoresponseAnyoneItemID"));
show_autoresponded = gSavedPerAccountSettings.getBOOL("AutoresponseAnyoneShow");
}
pack_instant_message(gMessageSystem, gAgentID, false, gAgentSessionID, from_id, my_name, replace_wildcards(response, from_id, name), IM_ONLINE, IM_BUSY_AUTO_RESPONSE, session_id);
gAgent.sendReliableMessage();
if (show_autoresponded)
{
gIMMgr->addMessage(session_id, from_id, LLStringUtil::null, LLTrans::getString("IM_autoresponded_to") + " " + pns_name);
}
if (LLViewerInventoryItem* item = gInventory.getItem(itemid))
{
LLGiveInventory::doGiveInventoryItem(from_id, item, computed_session_id);
if (show_autoresponded)
{
gIMMgr->addMessage(computed_session_id, from_id, LLStringUtil::null,
llformat("%s %s \"%s\"", pns_name.c_str(), LLTrans::getString("IM_autoresponse_sent_item").c_str(), item->getName().c_str()));
}
}
}
}
LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
gIMMgr->processIMTypingStart(im_info);
}
@@ -2681,6 +2617,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
bucketp = (struct offer_agent_bucket_t*) &binary_bucket[0];
info->mType = (LLAssetType::EType) bucketp->asset_type;
info->mObjectID = bucketp->object_id;
info->mFromObject = FALSE;
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (RlvUtil::isNearbyAgent(from_id)) )
@@ -2689,7 +2626,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
// [/RLVa:KB]
}
else
else // IM_TASK_INVENTORY_OFFERED
{
if (sizeof(S8) != binary_bucket_size)
{
@@ -2699,6 +2636,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
info->mType = (LLAssetType::EType) binary_bucket[0];
info->mObjectID = LLUUID::null;
info->mFromObject = TRUE;
}
info->mIM = dialog;
@@ -2707,7 +2645,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
info->mTransactionID = session_id;
info->mFolderID = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(info->mType));
info->mFromObject = (dialog == IM_TASK_INVENTORY_OFFERED);
info->mFromName = name;
info->mDesc = message;
info->mHost = msg->getSender();
@@ -2912,7 +2849,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
chat.mText = name + separator_string + message.substr(message_offset);
// Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
// IMs from objcts don't open IM sessions.
// IMs from objects don't open IM sessions.
LLFloaterChat::addChat(chat, FALSE, FALSE);
}
break;
@@ -2980,7 +2917,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
else
{
// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Modified: RLVa-1.2.2c
if (rlv_handler_t::isEnabled())
{
if (!gRlvHandler.canTeleportViaLure(from_id))
@@ -3451,10 +3388,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)";
}
if (from_name.empty())
{
from_name = LLTrans::getString("Unnamed");
}
msg->getUUID("ChatData", "SourceID", from_id);
chat.mFromID = from_id;
@@ -3526,8 +3463,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// </edit>
if (chatter)
{
LLSD args;
args["NAME"] = from_name;
chat.mPosAgent = chatter->getPositionAgent();
// Make swirly things only for talking objects. (not script debug messages, though)
@@ -3617,7 +3552,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
}
}
// NaCl End
static std::map<LLUUID, bool> sChatObjectAuth;
if ((source_temp == CHAT_SOURCE_OBJECT) && (type_temp == CHAT_TYPE_OWNER) &&
@@ -3784,23 +3719,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
return;
}
// We have a real utterance now, so can stop showing "..." and proceed.
if (chatter && chatter->isAvatar())
{
LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, FALSE);
((LLVOAvatar*)chatter)->stopTyping();
if (!is_muted && !is_busy)
{
static const LLCachedControl<bool> use_chat_bubbles("UseChatBubbles",false);
visible_in_chat_bubble = use_chat_bubbles;
((LLVOAvatar*)chatter)->addChat(chat);
}
}
// Look for IRC-style emotes
if (ircstyle)
{
// set CHAT_STYLE_IRC to avoid adding Avatar Name as author of message. See EXT-656
chat.mChatStyle = CHAT_STYLE_IRC;
// Do nothing, ircstyle is fixed above for chat bubbles
}
else
@@ -3852,7 +3776,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
}
}
RlvForceWear::instance().done();
if (RlvForceWear::instanceExists())
RlvForceWear::instance().done();
if ( (!RlvSettings::getDebug()) || ((strExecuted.empty()) && (strFailed.empty()) && (strRetained.empty())) )
return;
@@ -3925,7 +3850,21 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
chat.mText = from_name + verb + mesg;
}
// We have a real utterance now, so can stop showing "..." and proceed.
if (chatter && chatter->isAvatar())
{
LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, FALSE);
((LLVOAvatar*)chatter)->stopTyping();
if (!is_muted && !is_busy)
{
static const LLCachedControl<bool> use_chat_bubbles("UseChatBubbles",false);
visible_in_chat_bubble = use_chat_bubbles;
((LLVOAvatar*)chatter)->addChat(chat);
}
}
if (chatter)
{
chat.mPosAgent = chatter->getPositionAgent();
@@ -4385,24 +4324,31 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
}
}
if ( LLTracker::isTracking(NULL) )
if (LLTracker::isTracking())
{
// Check distance to beacon, if < 5m, remove beacon
LLVector3d beacon_pos = LLTracker::getTrackedPositionGlobal();
LLVector3 beacon_dir(agent_pos.mV[VX] - (F32)fmod(beacon_pos.mdV[VX], 256.0), agent_pos.mV[VY] - (F32)fmod(beacon_pos.mdV[VY], 256.0), 0);
if (beacon_dir.magVecSquared() < 25.f)
{
LLTracker::stopTracking(NULL);
LLTracker::stopTracking(false);
}
else if ( is_teleport && !gAgent.getTeleportKeepsLookAt() )
else if (is_teleport)
{
//look at the beacon
LLVector3 global_agent_pos = agent_pos;
global_agent_pos[0] += x;
global_agent_pos[1] += y;
look_at = (LLVector3)beacon_pos - global_agent_pos;
look_at.normVec();
gAgentCamera.slamLookAt(look_at);
if (!gAgent.getTeleportKeepsLookAt())
{
//look at the beacon
LLVector3 global_agent_pos = agent_pos;
global_agent_pos[0] += x;
global_agent_pos[1] += y;
look_at = (LLVector3)beacon_pos - global_agent_pos;
look_at.normVec();
gAgentCamera.slamLookAt(look_at);
}
if (gSavedSettings.getBOOL("ClearBeaconAfterTeleport"))
{
LLTracker::stopTracking(false);
}
}
}
@@ -7716,7 +7662,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
msg->getVector3("Data", "LookAt", look_at);
gFloaterWorldMap->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
LLFloaterWorldMap::show(NULL, TRUE);
LLFloaterWorldMap::show(true);
// remove above two lines and replace with below line
// to re-enable parcel browser for llMapDestination()

2
indra/newview/llworldmapview.cpp
View File

@@ -2072,7 +2072,7 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask )
{
// While we're waiting for data from the tracker, we're busy. JC
LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
if (LLTracker::isTracking(NULL)
if (LLTracker::isTracking()
&& pos_global.isExactlyZero())
{
gViewerWindow->setCursor( UI_CURSOR_WAIT );

2
indra/newview/rlvui.cpp
View File

@@ -277,7 +277,7 @@ void RlvUIEnabler::onToggleShowWorldMap()
// Simulate clicking the Map button [see LLToolBar::onClickMap()]
if ((!fEnable) && gFloaterWorldMap->getVisible())
LLFloaterWorldMap::toggle(NULL);
LLFloaterWorldMap::toggle();
}
// Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a

25
indra/newview/skins/default/xui/en-us/floater_ao.xml
View File

@@ -10,35 +10,14 @@
width="610"
height="380">
<view_border blevel_style="in" border_thickness="0" bottom="-380" follows="left|top" height="380" left="1"
mouse_opaque="false" name="ao_notecard" width="610" />
<view_border blevel_style="in" bottom="340" follows="left|top" height="16" left="10"
mouse_opaque="false" name="ao_notecard_vis" width="180" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
mouse_opaque="true" name="Give inventory"
tool_tip="Drop a ZHAO notecard here. Animations have to be in the same Inventory folder as the notecard." v_pad="2"
width="180">
Drop a ZHAO II notecard here
</text>
<view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
mouse_opaque="false" name="ao_notecard_disp" width="180" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
mouse_opaque="true" name="ao_nc_text"
tool_tip="" v_pad="2"
width="180">
Currently set to: ITEM
</text>
<drop_target bottom="-78" height="15" left="14" width="176" control_name="AOConfigNotecardID" fill_parent="true" name="ao_notecard" tool_tip="Drop a ZHAO notecard here. Animations have to be in the same Inventory folder as the notecard."/>
<button
name="opencard"
label="View Notecard"
font="SansSerifSmall"
left="10"
bottom_delta="-30"
bottom="-108"
width="110"
height="20"
follows="bottom|left"

16
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -169,20 +169,8 @@
mouse_opaque="true" name="Give item:" v_pad="0" width="75">
Give item:
</text>
<view_border blevel_style="in" border_thickness="0" bottom="-490" follows="left|top"
height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
width="409" />
<view_border blevel_style="in" bottom="-427" follows="left|top" height="16" left_delta="75"
mouse_opaque="false" name="drop_target_rect_vis" width="321" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
mouse_opaque="true" name="Give inventory"
tool_tip="Drop inventory items here to give them to this person." v_pad="2"
width="321">
Drop inventory item here.
</text>
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
<drop_target bottom="-425" height="15" left_delta="81" width="318" fill_parent="true" name="drop_target_rect" label="Drop inventory item here." tool_tip="Drop inventory items here to give them to this person."/>
<check_box bottom="-447" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show in search" left="75" mouse_opaque="true"
name="allow_publish"
tool_tip="Publish extra profile information such as description and image in Search."

5
indra/newview/skins/default/xui/en-us/panel_group_notices.xml
View File

@@ -107,9 +107,8 @@ and you can&apos;t send a folder.
name="drop_target2" width="76" />
<icon bottom_delta="7" height="64" image_name="icon_groupnoticeinventory.tga"
left_delta="5" mouse_opaque="true" name="drop_icon" width="64" />
<panel bottom="0" height="466" left="0" mouse_opaque="false" name="drop_target"
tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."
width="422" />
<group_drop_target bottom="24" left="67" fill_parent="true" height="14" width="207" name="drop_target"
tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."/>
</panel>
<panel border="false" bottom="0" follows="all" height="268" label="View Past Notice"
left="1" mouse_opaque="true" name="panel_view_past_notice" width="418">

60
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -8,6 +8,7 @@
label="Announce incoming instant messages" tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter." name="quickstart_im_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
label="Don't send '[name] is typing...' in IMs" tool_tip="IM partners will not see '______ is typing...' when you're responding." name="hide_typing_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="InstantMessagesFriendsOnly" label="Only accept IMs from Friends" name="InstantMessagesFriendsOnly"/>
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAllowMUpose" initial_value="false"
label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
@@ -25,7 +26,7 @@
label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="ShowDisplayNameChanges" label="Show display name changes" tool_tip="When checked, a notification will come up in chat whenever someone's display name changes." name="display_name_change"/>
<check_box bottom_delta="-20" follows="left|top" control_name="UseTypingBubbles" label="Use overhead typing indicator bubbles" name="use_typing_bubbles"/>
<text bottom="-150" left="10" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
<text bottom="-160" left="10" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
follows="top" height="20" left="20" name="objects_link" width="350">
<radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
@@ -45,30 +46,9 @@
<combo_item name="month_first" value="default">MM/DD/YYYY</combo_item>
</combo_box>
<check_box bottom_delta="0" left="240" follows="top" control_name="SecondsInLog" label="Seconds in Log timestamps" name="seconds_in_log"/>
<!-- Auto-responder -->
<view_border bottom="-420" left="5" height="190" bevel_style="none" border_thickness="1" name="GraphicsBorder" width="485"/>
<check_box bottom_delta="168" left="10" follows="top" initial_value="false" label="Enable Autoresponse"
name="AscentInstantMessageResponseAnyone" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" follows="left|top" initial_value="false"
label="Autorespond to non-friends" name="AscentInstantMessageResponseFriends" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" follows="left|top" initial_value="false"
label="Autorespond to people you have muted" name="AscentInstantMessageResponseMuted" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Send as soon as they start typing" name="AscentInstantMessageShowOnTyping"/>
<check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Don't show IMs you auto-responsed to" name="AscentInstantMessageShowResponded"/>
<check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Autorespond to every message" name="AscentInstantMessageResponseRepeat"/>
<check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Send an item along with the response" name="AscentInstantMessageResponseItem" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
<view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5" mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
<text bottom_delta="0" drop_shadow_visible="true" follows="left|top" halign="center" height="16" name="im_give_disp_rect_txt" tool_tip="Drop an inventory item here to have it given along with the auto-response." width="230">Drop item here (Currently: NONE)</text>
<text bottom_delta="140" left_delta="240" follows="left|top" height="18" name="text_box1">Response Text:</text>
<text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
#f for user's first name, #l for last name,
#t for timestamp, #r for SLURL to you,
#i for your idle time. (e.g. "5 mins")
</text>
</panel>
</panel>
<panel border="true" bottom="-580" height="525" label="Chat UI" left="1" name="ChatUI" width="418">
<panel border="true" bottom="-580" height="525" label="Chat UI" left="1" name="ChatUI" width="418">
<check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs"
label="Use Vertical IMs (Requires a restart)" name="use_vertical_ims_check"/>
<check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
@@ -78,7 +58,37 @@
<check_box bottom_delta="-20" control_name="UseConciseGroupChatButtons" follows="top" height="16" label="Buttons on group chat name line (Affects new group chats)" name="group_concise_butt"/>
<check_box bottom_delta="-20" control_name="UseConciseConferenceButtons" follows="top" height="16" label="Buttons on conference title line (Affects new conferences)" name="conf_concise_butt"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" control_name="CommunicateSpecificShortcut" name="only_comm"/>
</panel>
<check_box bottom_delta="-20" follows="top" height="16" control_name="LiruItalicizeActions" label="Italicize action messages (/me)" name="italicize_actions"/>
</panel>
<panel border="true" bottom="-580" height="525" label="Autoresponse" left="1" name="Autoresponse" width="525">
<text bottom="-25" follows="left|top" height="18" left="4" name="Autoresponse Info">
Autoresponse makes the viewer respond to people who message you, with a custom message.
The following wildcards are available to enhance your autoresponses: #n for user's legacy name,
#d for their display name, #r for SLURL to your location, #i for your idle time in minutes.
</text>
<check_box bottom_delta="-40" follows="left|top" control_name="AscentInstantMessageResponseRepeat" name="AscentInstantMessageResponseRepeat" label="Autorespond every time you receive a message you've enabled autoresponse for"/>
<check_box bottom_delta="-20" left="6" follows="top" control_name="AutoresponseAnyone" name="AutoresponseAnyone" label="Send basic autoresponse" tool_tip="Send the message in the box below to people you haven't muted."/>
<check_box bottom_delta="0" left_delta="150" follows="left|top" control_name="AutoresponseAnyoneFriendsOnly" name="AutoresponseAnyoneFriendsOnly" label="to friends only" tool_tip="Avoids sending this response to those you don't know"/>
<check_box bottom_delta="0" left_delta="100" follows="left|top" control_name="AutoresponseAnyoneItem" name="AutoresponseAnyoneItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="AutoresponseAnyoneShow" name="AutoresponseAnyoneShow" label="Show that this was sent"/>
<text_editor bottom_delta="-47" left="8" font="SansSerifSmall" follows="left|top" height="45" max_length="1100" control_name="AutoresponseAnyoneMessage" name="AutoresponseAnyoneMessage" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-122" left="10" height="15" width="476" control_name="AutoresponseAnyoneItemID" name="AutoresponseAnyoneItemID" tool_tip="Drop an item here to have it sent with the above response."/>
<check_box bottom_delta="80" left="6" follows="left|top" control_name="AutoresponseNonFriends" name="AutoresponseNonFriends" label="Autorespond to nonfriends" tool_tip="Send the message in the box below to people who are not your friends"/>
<check_box bottom_delta="0" left_delta="250" follows="left|top" control_name="AutoresponseNonFriendsItem" name="AutoresponseNonFriendsItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="AutoresponseNonFriendsShow" name="AutoresponseNonFriendsShow" label="Show that this was sent"/>
<text_editor bottom_delta="-47" left="8" font="SansSerifSmall" follows="left|top" height="45" max_length="1100" control_name="AutoresponseNonFriendsMessage" name="AutoresponseNonFriendsMessage" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-122" left="10" height="15" width="476" control_name="AutoresponseNonFriendsItemID" name="AutoresponseNonFriendsItemID" tool_tip="Drop an item here to have it sent with the above response."/>
<check_box bottom_delta="80" left="6" follows="left|top" control_name="AutoresponseMuted" name="AutoresponseMuted" label="Autorespond to people you have muted" tool_tip="Send the message in the box below to people you have muted."/>
<check_box bottom_delta="0" left_delta="250" follows="left|top" control_name="AutoresponseMutedItem" name="AutoresponseMutedItem" label="Send item"/>
<text_editor bottom_delta="-47" left="8" font="SansSerifSmall" follows="left|top" height="45" max_length="1100" control_name="AutoresponseMutedMessage" name="AutoresponseMutedMessage" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-122" left="10" height="15" width="476" control_name="AutoresponseMutedItemID" name="AutoresponseMutedItemID" tool_tip="Drop an item here to have it sent with the above response."/>
<text bottom_delta="86" left="8" follows="left|top" name="BusyModeResponseText" tool_tip="Send the message in the box below to people who message when you are busy.">Busy Mode Response:</text>
<check_box bottom_delta="-5" left_delta="250" follows="left|top" control_name="BusyModeResponseItem" name="BusyModeResponseItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="BusyModeResponseShow" name="BusyModeResponseShow" label="Show that this was sent"/>
<text_editor bottom_delta="-47" left="8" font="SansSerifSmall" follows="left|top" height="45" max_length="1100" control_name="BusyModeResponse" name="BusyModeResponse" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-122" left="10" height="15" width="476" control_name="BusyModeResponseItemID" name="BusyModeResponseItemID" tool_tip="Drop an item here to have it sent with the above response."/>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
<check_box control_name="AntiSpamEnabled" label="Enable Antispam" name="enable_as" width="256" left="3"/>

10
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -9,6 +9,7 @@
label="Reset camera after teleporting" tool_tip="Centers the camera behind you after a local teleport." name="center_after_teleport_check"/>
<check_box bottom_delta="-18" control_name="OptionOffsetTPByAgentHeight" follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Offset TP target by half agent height" tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for." name="offset_teleport_check"/>
<check_box left="10" follows="top" bottom_delta="-18" control_name="ClearBeaconAfterTeleport" name="clear_beacon_after_tp" label="Clear red destination beacon after teleporting"/>
<check_box left="10" follows="top" bottom_delta="-18" control_name="LiruFlyAfterTeleport" name="fly_after_tp" label="Always fly after teleports" tool_tip="Avoid those falls from great heights by automatically flying after teleporting in."/>
<check_box left="10" follows="top" bottom_delta="-18" control_name="LiruContinueFlyingOnUnsit" name="continue_flying" label="Continue flying upon standing" tool_tip="Keeps your Fly state the same as when you sat down, so you continue to fly or not when you stand up. Useful for birds, fairies, or those who just wish to make a dramatic leap from their chairs."/>
<check_box left="10" bottom_delta="-18" control_name="PreviewAnimInWorld" follows="top" initial_value="false"
@@ -133,12 +134,9 @@
<combo_item name="Medium" value="Medium">Medium</combo_item>
<combo_item name="High" value="High">High</combo_item>
</combo_box>
<check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" follows="top" initial_value="false" label="Put an item into new objects" control_name="EmeraldBuildPrefs_EmbedItem"/>
<view_border blevel_style="in" bottom_delta="-35" left="25" follows="top" height="35" name="build_item_drop_target_rect" width="194"/>
<text bottom_delta="16" left_delta="8" follows="top" height="16" name="Give inventory" halign="center" width="178">Drop inventory item here</text>
<view_border blevel_style="in" bottom_delta="-16" left_delta="-8" follows="top" height="16" name="build_item_add_disp_rect" width="194"/>
<text bottom_delta="0" left_delta="0" follows="top" height="16" name="build_item_add_disp_rect_txt" halign="center" width="192">Currently set to: ITEM</text>
<check_box bottom_delta="17" follows="top" left_delta="194" label="Highlight selected prims" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
<check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-20" follows="top" initial_value="false" label="Put an item into new objects" control_name="EmeraldBuildPrefs_EmbedItem"/>
<drop_target control_name="EmeraldBuildPrefs_Item" bottom_delta="-5" left="10" height="15" name="build_item_add_disp_rect" width="270"/>
<check_box bottom_delta="4" follows="top" left_delta="274" label="Highlight selected prims" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
<check_box bottom_delta="-20" follows="top" initial_value="false" label="Axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
</panel>

2
indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
View File

@@ -8,8 +8,6 @@
<check_box bottom="-65" height="16" initial_value="false" label="Include IM in chat console" name="include_im_in_chat_console"/>
<check_box bottom="-85" height="16" initial_value="false" label="Show timestamps in IM" name="show_timestamps_check"/>
<check_box bottom="-105" height="16" initial_value="false" label="Show online Friend notifications" name="friends_online_notify_checkbox"/>
<text bottom="-125" height="10" left="12" name="text_box3">Busy Mode Response:</text>
<text_editor font="SansSerifSmall" bottom="-185" follows="top" height="70" left="148" max_length="255" name="busy_response" width="330" word_wrap="true" spell_check="true"/>
<text bottom="-218" height="10" left="12" name="text_box4">Logging Options:</text>
<check_box bottom="-225" height="16" initial_value="false" label="Save a log of IM on my computer" left="148" name="log_instant_messages" />
<check_box bottom="-245" height="16" initial_value="false" label="Show timestamps in IM log" left="168" name="log_instant_messages_timestamp"/>

1
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -3981,6 +3981,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<!-- IM system messages -->
<string name="IM_announce_incoming">has begun an IM session with you.</string>
<string name="IM_autoresponded_to">Autoresponse sent to</string>
<string name="IM_autoresponse_minutes">[MINS] minutes</string>
<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
<string name="Unnamed">(Unnamed)</string>
<string name="inventory_item_offered_to">Inventory item offered to</string>