Mnikolenko ProductEngine
418b0334f2
CHUI-716 FIXED Call onClickCloseBtn() to avoid complete disappearing of torn off Nearby chat.
2013-02-06 15:06:27 +02:00
Merov Linden
5b143ee2c7
CHUI-677 : Fixed! Use the selected session for doToSelectedGroup(), not the selected item.
2013-02-05 22:26:58 -08:00
Merov Linden
dadc5e84e1
Pull merge from lindenlab/viewer-chui
2013-02-05 21:13:06 -08:00
Merov Linden
2aee8f6fbe
CHUI-730 : Fixed! Only clear out More sub menus in inventory
2013-02-05 21:11:33 -08:00
Merov Linden
5d8c990276
Pull merge from lindenlab/viewer-chui
2013-02-04 19:29:56 -08:00
Merov Linden
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
Gilbert Gonzales
cfb8d6abcb
merge
2013-02-04 17:49:12 -08:00
Merov Linden
e5c593682a
Pull merge from lindenlab/viewer-chui
2013-02-04 14:43:20 -08:00
Merov Linden
3e73b107d3
CHUI-677 : Added a warning printout in the log to capture context of this bug.
2013-02-04 14:41:58 -08:00
Gilbert Gonzales
aef695dcef
merge
2013-02-04 09:34:32 -08:00
maksymsproductengine
85f7f43069
CHUI-695 FIXED Viewer crashes after attempt to accept a friendship in IM
2013-02-04 19:11:17 +02:00
Mnikolenko ProductEngine
2f6ffe2183
CHUI-721 FIXED Delete transcripts when performing Clear log action.
2013-02-04 14:37:29 +02:00
Gilbert Gonzales
a47be3a83c
merge
2013-02-01 18:06:00 -08:00
Gilbert Gonzales
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
Cho
2fe6fce018
merging
2013-02-02 01:36:59 +00:00
Cho
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
Gilbert Gonzales
142833f93f
merge
2013-02-01 11:18:40 -08:00
Gilbert Gonzales
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
Cho
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
Mnikolenko ProductEngine
97930c72b6
CHUI-715 FIXED Disable Gear button if no conversation is selected
2013-02-01 15:11:43 +02:00
mberezhnoy
8fbc0aada8
merging
2013-02-01 01:00:52 +02:00
maxim@mnikolenko
2ec0d24e4a
Merge
2013-01-31 19:25:42 +02:00
maxim@mnikolenko
8714b61014
CHUI-719 FIXED Font color was changed.
2013-01-31 19:05:15 +02:00
Merov Linden
22835e1ddb
Pull merge with lindenlab/viewer-chui
2013-01-31 08:20:33 -08:00
maxim@mnikolenko
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
mberezhnoy
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
Merov Linden
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
maksymsproductengine
d2a17e20ca
CHUI-612 FIXED Blank conversation names showing in conversation list
2013-01-31 03:16:25 +02:00
mberezhnoy
84148762d9
merging
2013-01-30 21:30:20 +02:00
Cho
6af899f19e
merging latest changes
2013-01-30 17:42:12 +00:00
mberezhnoy
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
Oz Linden
e7c0f69c8e
pull back more 3.4.5 beta fixes
2013-01-29 22:35:11 -05:00
Cho
a7e6dc088f
merging latest changes
2013-01-30 02:56:33 +00:00
Cho
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
Merov Linden
3f4a562508
Pull merge from lindenlab/viewer-chui
2013-01-29 17:50:17 -08:00
Merov Linden
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
Oz Linden
d331592fc7
merge changes for MAINT-2276
2013-01-29 19:22:00 -05:00
Oz Linden
2fa8205d4d
MAINT-2281: correct test for XP (corrected fix I applied incorrectly)
2013-01-29 18:39:51 -05:00
Oz Linden
07deaaef88
tag merge of DRTVWR-292
2013-01-29 18:27:40 -05:00
Gilbert Gonzales
edb5be4ec0
CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In order to mute a user who initiated a conference/group chat, the session must be created on the server side and then left.
2013-01-29 14:41:37 -08:00
Gilbert Gonzales
f70504c0ef
merge
2013-01-29 11:15:23 -08:00
Oz Linden
bfbf4a6c46
Added tag DRTVWR-291 for changeset 7f09bbc28c29
2013-01-29 14:12:55 -05:00
Gilbert Gonzales
e179add865
CHUI-667: Attempting to correct Mac/Linux build issue.
2013-01-29 11:02:23 -08:00
Gilbert Gonzales
4c5790d4bf
CHUI-667: Post code review changes
2013-01-28 18:27:54 -08:00
Cho
acd28e28bc
merging latest changes
2013-01-29 00:19:29 +00:00
Cho
f9d44737b7
merging latest changes
2013-01-29 00:19:05 +00:00
Cho
44b681f5db
CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately.
...
Removed new code from on_new_message in LLIMView and instead, changed condition in LLFloaterIMSession::newIMCallback to update messages whenever the floater is visible
2013-01-29 00:16:40 +00:00
Merov Linden
af96927099
Fix test failure
2013-01-28 15:41:01 -08:00
mberezhnoy
c731d3c2be
merge
2013-01-28 20:15:42 +02:00
Graham Madarasz (Graham)
2676f516f2
For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted
2013-01-28 10:15:10 -08:00