ec6c132e14
merging
2013-02-08 19:18:06 +00:00
4a0dd9ec76
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation
...
Renamed LLDockControl::mDockWidget to mDockWidgetHandle for clarity
2013-02-08 19:16:38 +00:00
c55e4a6124
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation
...
Changed LLPersistentNotificationStorage::saveNotification() to use notification->asLLSD(true) to skip duplicates
Changed LLDockControl::mDockWidget to be a LLHandle<LLView> instead of a LLView* to fix crash (from accessing deleted LLView)
2013-02-08 02:03:28 +00:00
29a57c16c9
CHUI-736: When auto-exit DND mode upon startup, stored conversations are not highlighted. When the dnd im is processed, now flash the conversation line item.
2013-02-07 14:41:38 -08:00
3016afcd06
Pull merge from lindenlab/viewer-chui
2013-02-07 13:39:50 -08:00
dac026a7d6
CHUI-735 : Fixed! Handle the backspace case, suppress the search string handling from LLFolderView (it's in the search edit field now).
2013-02-07 13:27:32 -08:00
68a4a8402c
CHUI-722 Fixed! Add ? button to titlebar on floaters: Conversation Log, Nearby Chat History, and IM History
2013-02-07 19:39:46 +02:00
560aba3aa4
Pull merge from lindenlab/viewer-chui
2013-02-06 18:18:44 -08:00
7ed270ff9d
CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.
2013-02-06 18:11:52 -08:00
ec0ac12eba
CHUI-712 FIXED IM log files renamed with ll.txt will create double files for users
2013-02-06 20:51:14 +02:00
f944608ab9
CHUI-707: "Chat" toolbar button stop flashing after setting toolbar buttons view to "Icons only": save/restore flashing states
2013-02-06 20:00:43 +02:00
302f57e47f
CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to settings_per_account.xml
2013-02-06 20:17:35 +02:00
9b0404c4b5
merge
2013-02-06 19:59:57 +02:00
418b0334f2
CHUI-716 FIXED Call onClickCloseBtn() to avoid complete disappearing of torn off Nearby chat.
2013-02-06 15:06:27 +02:00
3781615afa
CHUI-597 (Messages shown in Conversation Log are inaccurate)
...
Added messages, for now they're displayed in two cases:
1) no log entries, logging disabled
2) no log entries, logging enabled
Case when there are existing log entries and
logging is disabled is still under discussion
2013-02-06 10:03:42 +02:00
5b143ee2c7
CHUI-677 : Fixed! Use the selected session for doToSelectedGroup(), not the selected item.
2013-02-05 22:26:58 -08:00
dadc5e84e1
Pull merge from lindenlab/viewer-chui
2013-02-05 21:13:06 -08:00
2aee8f6fbe
CHUI-730 : Fixed! Only clear out More sub menus in inventory
2013-02-05 21:11:33 -08:00
5d8c990276
Pull merge from lindenlab/viewer-chui
2013-02-04 19:29:56 -08:00
6a68f16f2e
CHUI-732 : Fixed! Do not iterate through selection while modufying it at the same time, use a temp set.
2013-02-04 19:29:05 -08:00
cfb8d6abcb
merge
2013-02-04 17:49:12 -08:00
e5c593682a
Pull merge from lindenlab/viewer-chui
2013-02-04 14:43:20 -08:00
3e73b107d3
CHUI-677 : Added a warning printout in the log to capture context of this bug.
2013-02-04 14:41:58 -08:00
aef695dcef
merge
2013-02-04 09:34:32 -08:00
85f7f43069
CHUI-695 FIXED Viewer crashes after attempt to accept a friendship in IM
2013-02-04 19:11:17 +02:00
2f6ffe2183
CHUI-721 FIXED Delete transcripts when performing Clear log action.
2013-02-04 14:37:29 +02:00
a47be3a83c
merge
2013-02-01 18:06:00 -08:00
7705b43889
CHUI-691: Now when an estate message is received while in DND mode, a toast notification will appear.
2013-02-01 18:04:33 -08:00
2fe6fce018
merging
2013-02-02 01:36:59 +00:00
1192abd7eb
CHUI-720 FIX User can open "Add friend" by pressing on a line in context menu for user that already is friend
...
Added check for getVisible() and getEnabled() before passing along handleMouseDown() and handleMouseUp() callbacks to other menu items in LLMenuItemSeparatorGL
2013-02-01 21:55:03 +00:00
142833f93f
merge
2013-02-01 11:18:40 -08:00
dde030e6cd
CHUI-689: When DND mode is enabled, making a direct delivery purchase results in an IM message from '(Nobody)'. Solution: Fixed a problem in process_improved_im that would falsy use system messages while in DND mode as an IM from a user. Also made it so that while in DND mode, SystemMessages and message with a high or greater priority are shown to the user as toasts (before a notification chiclet would just appear without the toast).
2013-02-01 11:18:23 -08:00
56b158e486
CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation
...
Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01 18:54:15 +00:00
97930c72b6
CHUI-715 FIXED Disable Gear button if no conversation is selected
2013-02-01 15:11:43 +02:00
8fbc0aada8
merging
2013-02-01 01:00:52 +02:00
2ec0d24e4a
Merge
2013-01-31 19:25:42 +02:00
8714b61014
CHUI-719 FIXED Font color was changed.
2013-01-31 19:05:15 +02:00
22835e1ddb
Pull merge with lindenlab/viewer-chui
2013-01-31 08:20:33 -08:00
0aa68e46fb
CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will also solve problem with chui-710.
2013-01-31 14:57:09 +02:00
a12200b91b
CHUI-718 (User does not see own chat in conference IM)
...
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-31 10:04:15 +02:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
d2a17e20ca
CHUI-612 FIXED Blank conversation names showing in conversation list
2013-01-31 03:16:25 +02:00
84148762d9
merging
2013-01-30 21:30:20 +02:00
6af899f19e
merging latest changes
2013-01-30 17:42:12 +00:00
b96f04a1bb
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-30 08:16:47 +02:00
e7c0f69c8e
pull back more 3.4.5 beta fixes
2013-01-29 22:35:11 -05:00
a7e6dc088f
merging latest changes
2013-01-30 02:56:33 +00:00
4f0237007a
CHUI-647 FIX "Conversations" floater is not opened when user wants to share something via "Conversation log" floater
...
Added call to show conversations floater in LLAvatarActions::share
2013-01-30 02:54:59 +00:00
3f4a562508
Pull merge from lindenlab/viewer-chui
2013-01-29 17:50:17 -08:00
df84e3c187
CHUI-436 : Fixed : Do not skip yourself or group chat when checked Only friends and groups can call or IM me pref.
2013-01-29 17:47:34 -08:00
Cho