summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-02Pull merge Gil's changesMerov Linden
2012-11-02Added tag 3.4.1-beta12 for changeset b6b68f3c2c6dOz Linden
2012-11-02CHUI-481 : WIP : Make updateSessionName() a virtual method of ↵Merov Linden
LLIMConversation so we can eventually call it on events
2012-11-01Added tag 3.4.1-beta12 for changeset 853a20242639Oz Linden
2012-11-01tag merge of DRTVWR-237Oz Linden
2012-11-01merging in latest changesGilbert Gonzales
2012-11-01CHUI-472: Problem: Only the converation panel was user/auto resizeable but ↵Gilbert Gonzales
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-01merging into latest changesMaximB ProductEngine
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-01CHUI-445 FIXED Select the next conversation in the list when current ↵maxim_productengine
conversation is deleted
2012-11-01CHUI-446 FIXED Checkm mParent before using dynamic_castmaxim_productengine
2012-11-01CHUI-444 (Click target off when conversation list is minimized to icons)MaximB ProductEngine
2012-10-31CHUI-474 : Fixed. Refresh the participants list in torn off dialog more often.Merov Linden
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-31MergeMerov Linden
2012-10-31Pull and merge from ssh://stinson@hg.lindenlab.com/stinson/viewer-chui/.William Todd Stinson
2012-10-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-31merging latest changesGilbert Gonzales
2012-10-31CHUI-374 ADD. FIX, CHUI-442 FIXED (Nearby chat is torn off and cannot be ↵AlexanderP ProductEngine
docked if nearby chat is received while conversation floater is closed) - implement. lazy creating of container
2012-10-30CHUI-463 : Fixed. Allowed a model to be shared by several views.Merov Linden
2012-10-30CHUI-471: Adjusted conversationview so that indentation of the avatar icon ↵Gilbert Gonzales
is dependent upon getIndentation() instead of modifying avatar icon's left value.
2012-10-30CHUI-461: Changing the default floater opacities according to Leo's guidelines.William Todd Stinson
2012-10-30CHUI-459: Creating a fetchAvatarName() method for the ↵William Todd Stinson
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-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30Added tag 3.4.1-beta11 for changeset 18498afcdb83Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30tag merge of DRTVWR-236Oz Linden
2012-10-30merging into latest changesMaximB ProductEngine
2012-10-30CHUI-415 FIXED Set focus to dependee floater before removing dependent ↵maxim_productengine
floater from it
2012-10-30CHUI-437 (Conversation floater shows as transparent after being minimized ↵MaximB ProductEngine
and unminimized)
2012-10-30CHUI-446 FIXED Check that parent_session is not nullmaxim_productengine
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-30tag merge of DRTVWR-235Oz Linden
2012-10-29Pull merge from richard/viewer-chuiMerov Linden
2012-10-29CHUI-469 : Fixed. Add the widget to its map, init the widget map ↵Merov Linden
consistently and correctly.
2012-10-26CHUI-469 : WIP : Add participants to the nearby chat torn off panelMerov Linden
2012-10-26CHUI-465 : Add event handling for LLIMConversation participant listMerov Linden
2012-10-26CHUI-383: Realized that prior changes for this bug caused a regress. The ↵Gilbert Gonzales
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-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-26merging in latest changesGilbert Gonzales
2012-10-26CHUI-383: Now a new conversation will not take focus. Instead a toast will ↵Gilbert Gonzales
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-26merging into latest changesMaximB ProductEngine
2012-10-26CHUI-439 (Conversation floater is automatically unminimized when a selected ↵MaximB ProductEngine
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-26CHUI-457 FIXED Check that selected participant is not self before performing ↵maxim_productengine
actions.
2012-10-25CHUI-441 : WIP : Fix crashes when spawning torn off floaters, added widgets ↵Merov Linden
creation in the torn off floater for participants.
2012-10-25MergeKelly Washington
2012-10-25CHUI-449: Post code review with Merov, adjusted setConvItemSelect() fuction ↵Gilbert Gonzales
to be called selectConversation().
2012-10-25CHUI-449: Got rid of a function called setItemSelect(), I wrote this code ↵Gilbert Gonzales
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-24CHUI-441 : WIP : Fix the initial attach code so to allow creation of the ↵Merov Linden
conversation item before the dialog
2012-10-24CHUI-441 : WIP : More map clean up and better use of get_ptr_in_map()Merov Linden