summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-11-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-02CHUI-475: Ensuring that objects that query the avatar name cache with a ↵William Todd Stinson
callback store the connection and disconnect on object destruction. This should help resolve some of the heap corruption we are seeing.
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-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
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-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-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-30merge changes for 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-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-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-449: Problem: When a toast was clicked, the conversation floater was ↵Gilbert Gonzales
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-24CHUI-363: Problem: Nearby chat is a set to be a null converstation. Because ↵Gilbert Gonzales
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-24disable tcmalloc againOz Linden
2012-10-24CHUI-430 FIXED Open Nearby chat if is is the only conversation in the list.maxim_productengine
2012-10-23Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-23Backed out changeset: 174fccc7016dWilliam Todd Stinson
2012-10-23CHUI-418 FIXED Check that mViewModelItem is not NULLmaxim_productengine
2012-10-22Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-22merging in latest changesGilbert Gonzales
2012-10-22CHUI-433: Implemented an alternate solution to the problem. The original ↵Gilbert Gonzales
solution was ambiguous and incomplete and also preserved an existing hack. The new solution removes a hack/deprecated code (setActiveSession/getActiveSession functions). Basically, a toast message is not displayed if the user already has the conversation in focus. When the conversation floater loses focus toasts message will be displayed for that conversation.
2012-10-22Backed out changeset: 4202e227f8e4William Todd Stinson
2012-10-22Enable tcmallocDave Parks
2012-10-22Trying original version of GBP with new scripts/code- revert corresponding ↵callum_linden
cpp code
2012-10-22merging in latest changesGilbert Gonzales
2012-10-22CHUI-428 (Scroll conversation list to the newly created conversation)MaximB ProductEngine
fixed
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-19CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking ↵Gilbert Gonzales
of the current conversation with focus. Resolution: Now when a conversation gains focus it will set a flag to ignore toasts. And when a conversation loses focus it will set a flag to re-enable toasts.
2012-10-19Pull merge from richard/viewer-chuiMerov Linden
2012-10-19CHUI-243: Add calls the parent class's implementation for onFocusReceived() ↵William Todd Stinson
and onFocusLost() to ensure that the focus change messages are properly propagated.
2012-10-19CHUI-422 : Add invited non buddies to the initial set of speakersMerov Linden
2012-10-19CHUI-391: Replacing nearby chat icon.William Todd Stinson