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
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
d331592fc7
merge changes for MAINT-2276
2013-01-29 19:22:00 -05:00
2fa8205d4d
MAINT-2281: correct test for XP (corrected fix I applied incorrectly)
2013-01-29 18:39:51 -05:00
07deaaef88
tag merge of DRTVWR-292
2013-01-29 18:27:40 -05:00
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
f70504c0ef
merge
2013-01-29 11:15:23 -08:00
bfbf4a6c46
Added tag DRTVWR-291 for changeset 7f09bbc28c29
2013-01-29 14:12:55 -05:00
e179add865
CHUI-667: Attempting to correct Mac/Linux build issue.
2013-01-29 11:02:23 -08:00
4c5790d4bf
CHUI-667: Post code review changes
2013-01-28 18:27:54 -08:00
acd28e28bc
merging latest changes
2013-01-29 00:19:29 +00:00
f9d44737b7
merging latest changes
2013-01-29 00:19:05 +00:00
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
af96927099
Fix test failure
2013-01-28 15:41:01 -08:00
c731d3c2be
merge
2013-01-28 20:15:42 +02:00
2676f516f2
For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted
2013-01-28 10:15:10 -08:00
daa5084dd6
merge
2013-01-28 09:53:42 -08:00
57795d3c89
CHUI-706 FIXED Appropriate function is now called in xml
2013-01-28 18:53:46 +02:00
4a96941b73
CHUI-395 (Group moderators are not shown as Moderators in group conversation)
2013-01-28 18:06:27 +02:00
aa524b18e5
CHUI-701 FIXED Don't show toasts and flashing, if conversation is opened but isn't focused.
2013-01-28 14:57:51 +02:00
2ce44afc7f
[MAINT-2233] Duplicate entries in notifications.xml
...
- Removed duplicate entry from panel_preferences_general.xml
2013-01-26 01:47:37 +00:00
c418d61627
CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-25 17:47:36 -08:00
c1b8e4b1ff
undid accidental revert of someone else's fix
2013-01-26 00:36:49 +00:00
fa54b50e02
CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately.
...
Added call to LLFloaterIMContainer::selectConversation() in on_new_message for LLIMView
2013-01-26 00:19:29 +00:00
564f11679d
[MAINT-2233] Duplicate entries in notifications.xml
...
- Removed duplicate notification elements
2013-01-25 23:29:09 +00:00
276800e6f2
MAINT-2281: correct test for XP
2013-01-29 18:09:13 -05:00
5e8e27838d
merging latest changes
2013-01-25 22:57:02 +00:00
427725c2a6
merging latest changes
2013-01-25 22:56:35 +00:00
163f3de73d
CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
...
Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string
2013-01-25 19:53:12 +00:00
dae5c6294a
merge changes for MAINT-2275, MAINT-2277
2013-01-25 14:43:48 -05:00
cc15a08ac4
merge changes for DRTVWR-290
2013-01-25 13:11:56 -05:00
c1827f7cf9
tag merge of DRTVWR-290
2013-01-25 13:11:52 -05:00
d67804543d
CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
...
Fixed autoreplace in LLTextEditor so it updates correctly and works with undo
2013-01-25 01:57:56 +00:00
Gilbert Gonzales