Merov Linden
|
7f2ea292e1
|
CHUI-474 : Fixed. Refresh the participants list in torn off dialog more often.
|
2012-10-31 19:27:41 -07:00 |
|
Merov Linden
|
e672984a48
|
Merge
|
2012-10-31 13:05:36 -07: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 |
|
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 |
|
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 |
|
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 |
|
Merov Linden
|
68815045a6
|
CHUI-441 : WIP : Initial refactor part 2. Works but the list doesn't update in the torn off dialog.
|
2012-10-24 13:18:41 -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 |
|
Merov Linden
|
3f020d0be9
|
CHUI-441 : WIP : Initial changes to LLIMFloater to use the same model as LLIMFloaterContainer
|
2012-10-22 19:26:18 -07: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 |