Commit Graph

25353 Commits (8828eb21e2a8960bbcfd4edb2d113dbada7d4a5d)

Author SHA1 Message Date
maksymsproductengine 8828eb21e2 CHUI-448 FIXED p2p IM chat conversations show a participant list with a carat 2012-11-06 22:02:09 +02:00
AlexanderP ProductEngine a337d7e597 Fixed postBuild() for Ad-hoc conference 2012-11-07 12:47:00 +02:00
Gilbert Gonzales 8d9aec9278 merging in latest changes 2012-11-06 17:56:47 -08:00
Gilbert Gonzales 50615ba69c CHUI-507: Updated to the new layout of 'Chat Preferences' according to CHUI Notifications spec. The functionality for the new preferences is not yet implemented. 2012-11-06 17:56:25 -08:00
maksymsproductengine 0a21efc7ab CHUI-374 FIXED Nearby chat is torn off and cannot be docked if nearby chat is received while conversation floater is closed 2012-11-05 17:52:04 +02:00
maxim_productengine 741fdfd3e6 CHUI-502 FIXED deleted registering Call floater from FloaterReg 2012-11-06 14:53:42 +02:00
maxim_productengine 622a697788 CHUI-460 FIXED Reselect current conversation on clicking expand/collapse button 2012-11-06 14:47:01 +02:00
William Todd Stinson 3b39ec165a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-02 17:56:35 -07:00
William Todd Stinson 6e2b3527cc CHUI-475: Ensuring that objects that query the avatar name cache with a callback store the connection and disconnect on object destruction. This should help resolve some of the heap corruption we are seeing. 2012-11-02 13:22:48 -07:00
Oz Linden 1f305e8624 Added tag 3.4.1-beta12 for changeset 3f9be82de642 2012-11-02 14:58:18 -04:00
Oz Linden dd55b600e5 whitespace change to force new build number 2012-11-02 14:58:09 -04:00
Oz Linden e00d2c8744 Added tag 3.4.1-beta12 for changeset b6b68f3c2c6d 2012-11-02 14:03:22 -04:00
Oz Linden fcb393f108 Added tag 3.4.1-beta12 for changeset 853a20242639 2012-11-01 20:50:20 -04:00
Oz Linden 6cd60fced2 tag merge of DRTVWR-237 2012-11-01 19:59:01 -04:00
MaximB ProductEngine b9116764a9 merging into latest changes 2012-11-01 20:22:55 +02:00
Dave Parks 9ff687218a Automated merge with http://bitbucket.org/lindenlab/viewer-beta 2012-11-01 11:29:03 -05:00
maxim_productengine 424a80155a CHUI-445 FIXED Select the next conversation in the list when current conversation is deleted 2012-11-01 16:58:55 +02:00
maxim_productengine d886d89f53 CHUI-446 FIXED Checkm mParent before using dynamic_cast 2012-11-01 15:00:50 +02:00
MaximB ProductEngine 51cabb2089 CHUI-444 (Click target off when conversation list is minimized to icons) 2012-11-01 13:56:25 +02:00
Dave Parks 44a024d2f5 MAINT-646 Fix for leak introduced by optimizations. 2012-10-31 16:00:56 -05:00
William Todd Stinson 8afae2b74b Pull and merge from ssh://stinson@hg.lindenlab.com/stinson/viewer-chui/. 2012-10-31 12:38:11 -07:00
William Todd Stinson be0406bffd Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-10-31 10:52:54 -07:00
AlexanderP ProductEngine a8ca9dc5a9 CHUI-374 ADD. FIX, CHUI-442 FIXED (Nearby chat is torn off and cannot be docked if nearby chat is received while conversation floater is closed) - implement. lazy creating of container 2012-10-31 17:51:55 +02:00
William Todd Stinson ec57bd2f8e CHUI-461: Changing the default floater opacities according to Leo's guidelines. 2012-10-30 16:28:57 -07:00
William Todd Stinson fb3df4790e CHUI-459: Creating a fetchAvatarName() method for the LLConversationItemParticipant class to allow the class to query for the avatar display name directly. Also, added a field to store the avatar name cache callback connection so that we can disconnect properly on object destruction to avoid a crash with the callback attempting to access recently freed memory. 2012-10-30 15:59:42 -07:00
Oz Linden e4df3c1ca8 Added tag 3.4.1-beta11 for changeset 18498afcdb83 2012-10-30 14:02:49 -04:00
Oz Linden 31a7a7ac02 merge changes for DRTVWR-236 2012-10-30 13:54:31 -04:00
Oz Linden d6e96021c8 tag merge of DRTVWR-236 2012-10-30 13:54:27 -04:00
MaximB ProductEngine 1160d82fb8 merging into latest changes 2012-10-30 18:50:37 +02:00
maxim_productengine 5215bf6ede CHUI-415 FIXED Set focus to dependee floater before removing dependent floater from it 2012-10-30 18:38:59 +02:00
MaximB ProductEngine d2087bdd8a CHUI-437 (Conversation floater shows as transparent after being minimized and unminimized) 2012-10-30 18:16:56 +02:00
maxim_productengine c0b1ae6d97 CHUI-446 FIXED Check that parent_session is not null 2012-10-30 17:28:39 +02:00
Oz Linden 5d20dc4782 merge changes for DRTVWR-235 2012-10-30 10:32:27 -04:00
Oz Linden e680af5e5d tag merge of DRTVWR-235 2012-10-30 10:32:17 -04:00
Gilbert Gonzales 1a1a0b91c0 CHUI-383: Realized that prior changes for this bug caused a regress. The regress was using the people panel or a notecard to start a im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to LLIMFloater::show() to LLIMFloaterContainer::showConversation(), which will first select the conversation line item and then show the corresponding conversation floater. 2012-10-26 16:49:22 -07:00
Dave Parks b8e14ad2b2 MAINT-1709 Fix for >> that should have been > > 2012-10-26 15:55:58 -05:00
Gilbert Gonzales 895e9036bb merging in latest changes 2012-10-26 11:41:39 -07:00
Gilbert Gonzales 83562e059f CHUI-383: Now a new conversation will not take focus. Instead a toast will appear. Problem: Each time a conversation was added, code would execute to add the conversation floater AND select the conversation. Resolution: This is no longer the expected behavior so adjusted LLIMFloater::addToHost() to only add a floater and not select/show the floater. If selection and/or showing is needed it seems to make sense that this is done outside LLIMFloater:addToHost(). 2012-10-26 11:36:14 -07:00
MaximB ProductEngine 2b27e33bc8 merging into latest changes 2012-10-26 21:08:15 +03:00
MaximB ProductEngine a815585fd7 CHUI-439 (Conversation floater is automatically unminimized when a selected user is removed from nearby chat participant list after teleport)
CHUI-438 (Conversation remains transparent after teleport with a participant selected in nearby chat)
2012-10-26 19:33:31 +03:00
maxim_productengine 8f1049b2f8 CHUI-457 FIXED Check that selected participant is not self before performing actions. 2012-10-26 15:22:31 +03:00
Gilbert Gonzales 7127ea0719 CHUI-449: Post code review with Merov, adjusted setConvItemSelect() fuction to be called selectConversation(). 2012-10-25 14:17:10 -07:00
Gilbert Gonzales 63548b973e CHUI-449: Got rid of a function called setItemSelect(), I wrote this code and it doesn't have a purpose anymore since I can use setConvItemSelect() instead. Also now torn off, minimized conversations are selected when clicking a toast for that conversation. Resolution: Adjusted setConvItemSelect() to be less strict when trying to select an item, now as long as the function is called it will attempt to select the conversation line item. 2012-10-25 11:43:18 -07:00
Gilbert Gonzales b77e2f17aa CHUI-449: Problem: When a toast was clicked, the conversation floater was displayed without selecting the conversation line item. Resolution: Added a function that will show the conversation floater container and then trigger selecting the conversation line item. When the conversation line item is selecting this implicitly will cause the correct conversation floater to be displayed. 2012-10-24 16:02:58 -07:00
Oz Linden 1743e6a813 Added tag 3.4.1-beta10 for changeset 4e0d84e92132 2012-10-24 14:31:05 -04:00
Gilbert Gonzales a9f8b94551 CHUI-363: Problem: Nearby chat is a set to be a null converstation. Because of this, when the voice indicator was set to only show for active conversations...voice indicators inside null conversations were not being turned toggled. Resolution: Now will adjust the speaker indicator even if it exists in a null (nearby chat) conversation. 2012-10-24 10:51:29 -07:00
Oz Linden 4f3395a744 disable tcmalloc again 2012-10-24 13:19:41 -04:00
maxim_productengine 06978c99d1 CHUI-430 FIXED Open Nearby chat if is is the only conversation in the list. 2012-10-24 13:06:30 +03:00
William Todd Stinson 873d03e96f Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-23 14:16:49 -07:00
William Todd Stinson 52a8ea96a1 Backed out changeset: 174fccc7016d 2012-10-23 10:38:04 -07:00