livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,278 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

25278 Commits (730ba97759deabd7fb45e63eae650f83c1d9ba99)

Author SHA1 Message Date
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
Gilbert Gonzales 49ad7fd4b5 CHUI-410: Post code review submit, changed useLabel() to return bool instead of BOOL. Adjusted code accordingly. 2012-10-17 17:52:10 -07:00
Merov Linden 1cd3c8408f CHUI-422 : Clean up of leftover traces and tests 2012-10-17 17:45:29 -07:00
Merov Linden 1006e2fd25 CHUI-422 : Update the ad-hoc conversation with the known list of on line agents without waiting for server message (which often doesn't come...). 2012-10-17 17:14:44 -07:00
Dave Parks 5a2f71b0bc MAINT-1527 Fix for crash on exit when VBO disabled 2012-10-17 18:18:06 -05:00
Gilbert Gonzales 3dc61c4b4a merging in latest changes 2012-10-17 15:28:40 -07:00
Gilbert Gonzales c320b4878a merging in latest code 2012-10-17 15:27:39 -07:00
Gilbert Gonzales 3ee73ee98d warn-on-failure:unix-eol 2012-10-17 15:26:51 -07:00
William Todd Stinson 33bd704c58 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-17 15:25:12 -07:00
Gilbert Gonzales 05a72687d8 CHUI-410: Now when a converation floater is focused the default text 'To <Some User>' displays only when the text input field is empty. 2012-10-17 14:55:36 -07:00
William Todd Stinson 44be1f4963 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-17 14:36:08 -07:00
MaximB ProductEngine 62d0793d62 merging in latest changes 2012-10-18 00:33:11 +03:00
William Todd Stinson 9da9b2d84b Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-17 14:32:29 -07:00
MaximB ProductEngine 8a42d5cea3 CHUI-399 (When user has Pressing Letter Keys starts local chat setting on, first presses of letter keys do not open chat) 
fixed
 2012-10-18 00:04:46 +03:00
William Todd Stinson 2f8e4f2408 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-17 13:23:54 -07:00
Merov Linden d60609e009 MAINT-1551 : WIP : More tests to elicit a correct answer from the backbone server 2012-10-17 12:26:40 -07:00
maksymsproductengine 30a04430df CHUI-419 FIXED Selecting the drop down arrow to list participants for a conversation does not select that conversation 2012-10-17 19:16:13 +03:00
maksymsproductengine 1251f45e62 CHUI-394 FIXED Group moderation tools missing in right click menus 2012-10-17 00:16:18 +03:00
Gilbert Gonzales f55d07114b merging in latest changes 2012-10-16 13:55:46 -07:00
Jeff (Gioffredo Linden) 86c3a45b67 Move const kw location 2012-10-16 16:08:25 -04:00
William Todd Stinson a46d4ada3a Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-16 12:23:15 -07:00
Jeff (Gioffredo Linden) 337cd3aa9d Make getValue const to fix Windows builds - and be more robust 2012-10-16 15:22:42 -04:00
Gilbert Gonzales ae093e02a1 CHUI-380: Realized that the when clicking the participant/conversation item that the active session wasn't being stored. This caused the right side conversation floater to not change when selecting a participant under a conersation. Resolution: now when clicking on a conversation or participant the active session is stored using setActiveSession(). 2012-10-16 11:38:36 -07:00
maxim_productengine 5a22949cf5 CHUI-388 FIXED Do not add menu items to Participant Menu if own avatar is selected in participant list. Do not show Menu if all menu items are disabled. 2012-10-16 15:33:12 +03:00
Oz Linden a7f6dcaef7 Added tag 3.4.1-beta8 for changeset 1dc94555582f 2012-10-15 23:19:06 -04:00
Oz Linden ab9debd994 tag merge of DRTVWR-228 2012-10-15 23:18:55 -04:00
Merov Linden 1557bffb56 MAINT-1551 : WIP : Added a hack : send an accept invitation message so to trigger the sending of the agent list. 2012-10-15 19:44:14 -07:00
Gilbert Gonzales d0f9600f37 CHUI-380: Bug fix after merge. When selecting the participant of a conversation focus would be lost on the converstation floater. This was because focus would be set to the participant folder item. Resolution: Now delegate focus from the particiapnt folder item to the conversation floater. 2012-10-15 16:06:02 -07:00