livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,412 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

25412 Commits (1786a7150e754ea10dfd5172ec2491dd67e83a9a)

Author SHA1 Message Date
Oz Linden dd55b600e5 whitespace change to force new build number 2012-11-02 14:58:09 -04:00
Merov Linden b6ad7db0d6 Pull merge Gil's changes 2012-11-02 11:03:46 -07:00
Oz Linden e00d2c8744 Added tag 3.4.1-beta12 for changeset b6b68f3c2c6d 2012-11-02 14:03:22 -04:00
Merov Linden ef5121ffb3 CHUI-481 : WIP : Make updateSessionName() a virtual method of LLIMConversation so we can eventually call it on events 2012-11-02 11:01:08 -07: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
Gilbert Gonzales 4cb8f69c10 merging in latest changes 2012-11-01 14:56:05 -07:00
Gilbert Gonzales 0f1c2f8aba CHUI-472: Problem: Only the converation panel was user/auto resizeable but the participants panel was not. By one have only resizable this prevented both panels from being resized. Solution: Now set the participants panel to be user/auto resizable as well. 2012-11-01 14:55:47 -07: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
Merov Linden 7f2ea292e1 CHUI-474 : Fixed. Refresh the participants list in torn off dialog more often. 2012-10-31 19:27:41 -07:00
Dave Parks 44a024d2f5 MAINT-646 Fix for leak introduced by optimizations. 2012-10-31 16:00:56 -05:00
Merov Linden e672984a48 Merge 2012-10-31 13:05:36 -07: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
Gilbert Gonzales cf6ce54537 merging latest changes 2012-10-31 09:51:48 -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
Merov Linden f9b1b44071 CHUI-463 : Fixed. Allowed a model to be shared by several views. 2012-10-30 18:27:56 -07:00
Gilbert Gonzales 9d98530823 CHUI-471: Adjusted conversationview so that indentation of the avatar icon is dependent upon getIndentation() instead of modifying avatar icon's left value. 2012-10-30 18:20:28 -07: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
Merov Linden a7a24dc2f9 Pull merge from richard/viewer-chui 2012-10-29 20:43:32 -07:00
Merov Linden 480c3a1acb CHUI-469 : Fixed. Add the widget to its map, init the widget map consistently and correctly. 2012-10-29 16:59:53 -07:00
Merov Linden 09282019ef CHUI-469 : WIP : Add participants to the nearby chat torn off panel 2012-10-26 19:12:19 -07:00
Merov Linden 36b1b4c4b6 CHUI-465 : Add event handling for LLIMConversation participant list 2012-10-26 17:04:17 -07: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
Merov Linden d49de3a66a CHUI-441 : WIP : Fix crashes when spawning torn off floaters, added widgets creation in the torn off floater for participants. 2012-10-25 18:16:56 -07: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
Merov Linden b5d76c2b55 CHUI-441 : WIP : Fix the initial attach code so to allow creation of the conversation item before the dialog 2012-10-24 20:08:36 -07:00
Merov Linden 853826efcc CHUI-441 : WIP : More map clean up and better use of get_ptr_in_map() 2012-10-24 18:12:27 -07:00
Merov Linden e6e2b0dda2 CHUI-441 : WIP : Fixed the creation of empty model records in the list model 2012-10-24 16:37:08 -07:00