summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-10-30CHUI-446 FIXED Check that parent_session is not nullmaxim_productengine
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-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-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-22merging in latest changesGilbert Gonzales
2012-10-22CHUI-428 (Scroll conversation list to the newly created conversation)MaximB ProductEngine
fixed
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
2012-10-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-19merge changes for DRTVWR-233Oz Linden
2012-10-19CHUI-416 FIXED Check if conversationItem is not NULL before calling getType().maxim_productengine
2012-10-19CHUI-418 FIXED Check the existence of mViewModelItem before calling ↵maxim_productengine
potentiallyVisible().
2012-10-18Pull merge from richard/viewer-chuiMerov Linden
2012-10-18CHUI-373 : Fix : Refresh panel after setting parcel for saleMerov Linden
2012-10-18MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid ↵William Todd Stinson
memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-18merging in latest changesGilbert Gonzales
2012-10-18CHUI-329: Post code review commit, instead of hard coded the parenthesis, ↵Gilbert Gonzales
created a custom string in string.xml. The reasoning for this is because some languages may not use the parenthesis or perhaps even use brackets if needed...basically allows for flexibility.
2012-10-18merge into latest changesMaximB ProductEngine
2012-10-18CHUI-329: The text is now gray due to CHUI 410. The only change in this ↵Gilbert Gonzales
commit is that parenthesis surround the nearby chat text (Nearby chat).
2012-10-18CHUI-431 : Merge of VITA changesMerov Linden
2012-10-18CHUI-412 (User restricted in resizing conversation floater width)MaximB ProductEngine
fixed
2012-10-17Pull merge from richard/viewer-chuiMerov Linden
2012-10-17CHUI-422 : One last clean upMerov Linden
2012-10-17CHUI-410: Post code review submit, changed useLabel() to return bool instead ↵Gilbert Gonzales
of BOOL. Adjusted code accordingly.
2012-10-17CHUI-422 : Clean up of leftover traces and testsMerov Linden
2012-10-17CHUI-422 : Update the ad-hoc conversation with the known list of on line ↵Merov Linden
agents without waiting for server message (which often doesn't come...).
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks
2012-10-17merging in latest changesGilbert Gonzales
2012-10-17merging in latest codeGilbert Gonzales
2012-10-17warn-on-failure:unix-eolGilbert Gonzales
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-17CHUI-410: Now when a converation floater is focused the default text 'To ↵Gilbert Gonzales
<Some User>' displays only when the text input field is empty.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:42:12 +0000