Commit Graph

26389 Commits (2f551019921ca12f9dd94f474a4d684e04d73dd7)

Author SHA1 Message Date
Merov Linden 2f55101992 Pull from lindenlab/viewer-chui 2013-01-16 14:55:41 -08:00
Merov Linden f43f51406b CHUI-683 : Default sort order for Blocked was wrong, unrecognized value was not tested. 2013-01-16 14:53:23 -08:00
Gilbert Gonzales 41a53e8649 merging changes 2013-01-15 20:37:54 -08:00
Gilbert Gonzales de9e2c3812 CHUI-668: Code review changes 2013-01-15 20:36:48 -08:00
Cho fd0cae39f3 merging latest changes 2013-01-16 01:25:54 +00:00
Merov Linden 27a32d34ba Merge with lindenlab/viewer-chui 2013-01-15 14:27:01 -08:00
Merov Linden 235a347736 CHUI-458 : Fixed : Tidy up the title overwrite by the selected conversation 2013-01-15 14:13:36 -08:00
Gilbert Gonzales 028ceaef14 merging in latest changes 2013-01-15 10:42:09 -08:00
maxim@mnikolenko a49d3b1425 CHUI-567 FIXED "Translate chat", "Translation settings..." menu items are added. 2013-01-15 14:07:55 +02:00
Cho b7f4916b3e CHUI-679 FIX Crash when script floater appears in CHUI viewer
LLPostponedNotification now inherits from LLMortician so it can postpone its deletion. This prevents a crash when looking up an avatar name in the case where the name already exists in the cache.
2013-01-15 02:48:52 +00:00
Gilbert Gonzales 0e90e94a4d CHUI-668: The user's most intrusive notification is not used anymore when coming out of DND mode with IMs. Adjusted code to just open the converseation floater (which was changed also in a prior fix by PE). 2013-01-14 17:23:06 -08:00
Merov Linden cefcdd445b CHUI-458 : WIP : Allow change of the general conversations panel when the selected conversation needs it (e.g. P2P is typing) 2013-01-14 15:26:59 -08:00
Cho cb82e865a0 merging latest changes? 2013-01-14 23:09:01 +00:00
maximbproductengine e206dff762 merge 2013-01-14 21:48:58 +02:00
maximbproductengine e44677ee79 CHUI-662 (Multi select across conversations can result in (???) (???) in the conversation list) 2013-01-14 21:48:37 +02:00
Gilbert Gonzales 44737a3992 merging latest changes 2013-01-14 10:59:46 -08:00
Cho b47a775199 reverted test commit 2013-01-14 18:37:29 +00:00
Gilbert Gonzales e42755dd16 CHUI-668: Now when exiting DND mode, the user's most intrusive notification will be used to notify that user (if received IM's during DND mode). Nearby chat messages/settings are ignored. 2013-01-11 19:43:12 -08:00
Gilbert Gonzales 69497e645b CHUI-668: Not fully complete but as of this commit, have functionality to use the user's most intrusive chat notification upon exiting from DND mode with IM's. Also if in DND mode, clicking on a conversation line item or floater, will flush the DND notifications system of storing that conversation. This way upon existing DND mode already responded conversations won't be notified to the user. 2013-01-11 18:20:29 -08:00
AlexanderP ProductEngine 23ffb7db1b CHUI-618 ADD FIX User sees no indication of offline messages received with conversation log preference turned off: changed in accordance with a new requirements (open conv. floater instead flashing) 2013-01-12 01:51:43 +02:00
Merov Linden d95faf30e1 Merge 3.4.4 tag 2013-01-11 19:24:02 -08:00
Merov Linden ef71206e30 pull from richard/viewer-chui 2013-01-11 18:40:54 -08:00
Merov Linden 5de5a17214 Pull from viewer-chui 2013-01-11 17:51:47 -08:00
Merov Linden 88639dd862 CHUI-650 : Revert : revert the change as it creates infinite recursive calls 2013-01-11 17:28:43 -08:00
Merov Linden 9f8959d480 Pull merge from viewer-chui 2013-01-11 14:18:36 -08:00
maxim@mnikolenko 16082462a4 CHUI-650 FIXED Set focus to floater when bringToFront() is called(even if it's already in front). 2013-01-11 15:32:05 +02:00
Merov Linden 2e31138630 CHUI-672 : Fixed : LLMultiFloater members need to be initialized in constructor. 2013-01-10 20:19:26 -08:00
Cho a8bc4787b9 test commit 2013-01-11 02:06:01 +00:00
Merov Linden 573ab07a40 Merge pull from lindenlab/viewer-beta 2013-01-10 14:51:59 -08:00
Merov Linden 45e72bf3cb Pull merge from richard/viewer-chui 2013-01-10 11:49:29 -08:00
Merov Linden b5b44ddf17 CHUI-649 : Fixed : Added the contextual menu to in build content tab 2013-01-10 11:10:41 -08:00
maximbproductengine f5a2929d8f merge 2013-01-10 18:01:17 +02:00
maximbproductengine bad4eda436 CHUI-663 (Right click menus on participants inactive in conversation floater for torn off conversation) 2013-01-10 13:41:47 +02:00
Merov Linden be3cfd872b CHUI-649 : WIP : Cleanup code to make it readable 2013-01-09 20:20:32 -08:00
Merov Linden 8309722049 Pull merge from richard/viewer-chui 2013-01-09 19:12:49 -08:00
Merov Linden 60eaa8875d CHUI-652 : Fixed : Maintain multi selection consistent when click and drag an already selected item (drag multi select was broken) 2013-01-09 19:10:41 -08:00
Oz Linden d16757545c Added tag 3.4.4-release for changeset e1bb1ae7d8b1 2013-01-09 18:19:24 -05:00
Gilbert Gonzales 41d5f820ea CHUI-670: Prevent flashing of 'Chat' FUI button while in DND mode and receive IM. 2013-01-09 14:30:10 -08:00
Gilbert Gonzales 6a30c4c3c5 CHUI-669: Upon DND mode exit, no longer flash IM messages that were stored during DND mode. 2013-01-09 13:30:14 -08:00
Merov Linden 9d70bc259a CHUI-652 : Fixed : Skip the bogus fetching test when adding objects to object content. 2013-01-09 12:45:34 -08:00
maxim@mnikolenko bb05a29374 CHUI-638 FIXED Don't force button and widget to flash if the object is muted. 2013-01-09 15:08:58 +02:00
maximbproductengine 3cf2d8e9ea CHUI-665 (Change "Open conversation log" to "Conversation log..." in communication floater view/sort menu) 2013-01-09 10:41:09 +02:00
Merov Linden c296a7eada Merge pull from richard/viewer-chui 2013-01-08 21:46:36 -08:00
Merov Linden 4ef1181cdc CHUI-659 : Fixed : Reimplemented open selection on hitting return the right way 2013-01-08 21:46:00 -08:00
Gilbert Gonzales b5172de28f CHUI-660: Post code review changes 2013-01-08 17:06:49 -08:00
maksymsproductengine def252341a CHUI-612 FIXED Blank conversation names showing in conversation list 2013-01-08 23:37:29 +02:00
maxim@mnikolenko 856969285e CHUI-658 FIXED Don't highlight whole content of the folder after right clicking if it is flashing. 2013-01-10 14:56:33 +02:00
Gilbert Gonzales 974720373d CHUI-660: Problem: Upon auto-existing DND mode upon startup, the notification form elements (buttonts) were added to the form. But then deserialized form elements were also being added to the form causing duplicate buttons. As a solution, only add on the deserialized form elements that exceed the amount in the template. 2013-01-08 12:21:47 -08:00
AlexanderP ProductEngine df5378cf38 CHUI-611 Fixed! Text in torn off message panel not wrapping correctly with size of conversation panel 2013-01-08 19:59:27 +02:00
maxim@mnikolenko dbe1d2f093 CHUI-602 FIXED Return false if Selected view model item is null. 2013-01-08 14:38:30 +02:00