Commit Graph

25305 Commits (ec57bd2f8e2859787b274c118fabbc19f76e04b1)

Author SHA1 Message Date
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
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
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
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
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
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
maxim_productengine a780eb1a92 CHUI-418 FIXED Check that mViewModelItem is not NULL 2012-10-23 13:20:53 +03:00
William Todd Stinson f3ede9d46c Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-22 17:40:48 -07:00
Gilbert Gonzales ab1f988c45 merging in latest changes 2012-10-22 17:32:38 -07:00
Gilbert Gonzales 23d58c0c09 CHUI-433: Implemented an alternate solution to the problem. The original 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-22 17:31:51 -07:00
William Todd Stinson 0d25cca2e1 Backed out changeset: 4202e227f8e4 2012-10-22 15:01:03 -07:00
Gilbert Gonzales 520a299620 merging in latest changes 2012-10-22 10:35:35 -07:00
MaximB ProductEngine 364e811867 CHUI-428 (Scroll conversation list to the newly created conversation)
fixed
2012-10-22 04:35:31 +03:00
Gilbert Gonzales b0c54dfd3e CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking 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-19 17:47:28 -07:00
Merov Linden 730ba97759 Pull merge from richard/viewer-chui 2012-10-19 17:42:22 -07:00
William Todd Stinson 0356ef61cf CHUI-243: Add calls the parent class's implementation for onFocusReceived() and onFocusLost() to ensure that the focus change messages are properly propagated. 2012-10-19 16:21:35 -07:00
Merov Linden e6a7133ef1 CHUI-422 : Add invited non buddies to the initial set of speakers 2012-10-19 13:57:40 -07:00
William Todd Stinson 2d0b6f033e CHUI-391: Replacing nearby chat icon. 2012-10-19 13:32:23 -07:00
William Todd Stinson 31f622ca04 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-10-19 11:21:18 -07:00
Oz Linden f2a674274f Added tag 3.4.1-beta9 for changeset 637fe8bbee5e 2012-10-19 14:07:05 -04:00
Oz Linden 246d2b9476 merge changes for DRTVWR-233 2012-10-19 14:06:55 -04:00
Oz Linden 04a16d2836 tag merge of DRTVWR-233 2012-10-19 14:06:50 -04:00
maxim_productengine 155cb976cb CHUI-416 FIXED Check if conversationItem is not NULL before calling getType(). 2012-10-19 19:10:35 +03:00
Oz Linden c8fcb6c798 Added tag 3.4.1-beta9 for changeset 9c4519aa5c70 2012-10-19 11:33:24 -04:00
Oz Linden f71d2a649b tag merge of DRTVWR-231 2012-10-19 10:31:11 -04:00
maxim_productengine 89ba6b793a CHUI-418 FIXED Check the existence of mViewModelItem before calling potentiallyVisible(). 2012-10-19 13:50:55 +03:00
Merov Linden c14975b8e4 Pull merge from richard/viewer-chui 2012-10-18 21:50:57 -07:00
Merov Linden d840a60ecc CHUI-373 : Fix : Refresh panel after setting parcel for sale 2012-10-18 21:49:02 -07:00
William Todd Stinson 11017315e6 MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid 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-18 17:36:57 -07:00
Gilbert Gonzales 18e5fa5bbd merging in latest changes 2012-10-18 13:17:06 -07:00
Gilbert Gonzales 2301c7cff6 CHUI-329: Post code review commit, instead of hard coded the parenthesis, 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-18 13:16:00 -07:00
MaximB ProductEngine c43cfcdcbd merge into latest changes 2012-10-18 22:29:02 +03:00
Gilbert Gonzales 36ea92678e CHUI-329: The text is now gray due to CHUI 410. The only change in this commit is that parenthesis surround the nearby chat text (Nearby chat). 2012-10-18 11:44:52 -07:00
Merov Linden f9c068462f CHUI-431 : Merge of VITA changes 2012-10-18 11:16:51 -07:00
MaximB ProductEngine c0b60841ce CHUI-412 (User restricted in resizing conversation floater width)
fixed
2012-10-18 16:50:40 +03:00
Merov Linden ec9260701f Pull merge from richard/viewer-chui 2012-10-17 19:33:09 -07:00
Merov Linden e561451768 CHUI-422 : One last clean up 2012-10-17 18:14:37 -07:00