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

25651 Commits (aa2640f13ab61fa55819af26b001978fa2dd9a3f)

Author SHA1 Message Date
maxim_productengine aa2640f13a CHUI-447 FIXED Set session name as avatar's display name, if session is created by getting new message. 2012-11-13 14:04:14 +02:00
maxim_productengine 6ba822c0ff CHUI-460 FIXED Reselect floater after toggling the participant list open or closed 2012-11-13 13:32:24 +02:00
Gilbert Gonzales 0e6139eb3d merging in latest changes 2012-11-12 12:58:28 -08:00
William Todd Stinson 7833ecb580 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-12 10:36:21 -08:00
AlexanderP ProductEngine ab5a0a1d4d CHUI-362 FIXED (Torn off conversation name is highlighted when selected in conversation list with different conversation showing in message panel): connect new method "returnFloaterToHost" to click on quasi-URL "Bring it back" 2012-11-12 15:06:42 +02:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Gilbert Gonzales 6f53b5baeb merging in latest changes 2012-11-09 17:01:20 -08:00
Gilbert Gonzales f429decb0c CHUI-486: Now the new chat preferences in drop down lists and checkboxes are storable. These values are accessible globally using gSavedSettings. 2012-11-09 17:00:43 -08:00
William Todd Stinson 1786a7150e CHUI-517: Updating the copy for the avatar in-world name bubble status for Do Not Disturb mode. 2012-11-09 16:16:06 -08:00
William Todd Stinson 908f8735d4 CHUI-517: Updating the copy in Preferences for Do Not Disturb mode. 2012-11-09 16:09:06 -08:00
William Todd Stinson 312cb2ab61 Cleaning up white-space in an xml file. 2012-11-09 15:53:58 -08:00
William Todd Stinson 873057a21a CHUI-517: Updating notification copy for Do Not Disturb mode. 2012-11-09 15:45:07 -08:00
William Todd Stinson 69f81d5bb6 CHUI-517: Updating the do not disturb message automatically sent to other users when they attempt to contact a person in do not disturb mode. 2012-11-09 14:58:37 -08:00
William Todd Stinson 4f58b4088a CHUI-517: Altering the behavior and copy of the main menu status choices. Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text. 2012-11-09 14:41:50 -08:00
Oz Linden 8a3384adaf Added tag 3.4.2-beta3 for changeset 710785535362 2012-11-09 16:16:03 -05:00
maxim_productengine 5790565ec6 Additional fix for CHUI-473 2012-11-09 19:44:37 +02:00
AlexanderP ProductEngine 3d42133ecb CHUI-362 WIP (Torn off conversation name is highlighted when selected in conversation list with different conversation showing in message panel): implemented the stub panel and a control of it's visibility 2012-11-09 17:04:21 +02:00
Oz Linden a1270b0ba2 tag merge of DRTVWR-242 2012-11-09 09:25:56 -05:00
AlexanderP ProductEngine 2813e49d19 CHUI-362 WIP (Torn off conversation name is highlighted when selected in conversation list with different conversation showing in message panel): implemented method for a switch off tabs (switching to an invisible state) 2012-11-09 15:13:52 +02:00
maksymsproductengine 8283747496 CHUI-386 FIXED Vertical scrollbar not fully showing in conversation message panel 2012-11-12 16:25:35 +02:00
Merov Linden 99181a9777 CHUI-479 : WIP : Fixed the missing agent appearance in torn off dialogs by adding a consistency check and rebuild. 2012-11-09 19:06:00 -08:00
Merov Linden 04e84eb826 Pull merge from viewer-chui 2012-11-09 17:24:47 -08:00
Merov Linden ff1dab1792 CHUI-450 : Fixed how the list of speakers is updated, always add the agent avatar in it, takes voice activation into account 2012-11-09 17:19:03 -08:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed: 
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
 2012-11-09 12:45:36 +02:00
William Todd Stinson 45336ca20d MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fix these issues, but then was accidentally re-introduced during a bad merge. 2012-11-08 17:37:01 -08:00
Merov Linden 3d70cca702 Pull merge from richard/viewer-chui. 2012-11-08 17:15:44 -08:00
Merov Linden 1d590cd5fd CHUI-464, CHUI-466, CHUI-474 : Fixed! Better, unified and more consistent use of refreshConversation() to update torn off dialogs. 2012-11-08 17:09:23 -08:00
William Todd Stinson 5aa5a77af6 CHUI-516: Correcting crash when receiving a god-like teleport lure request while in do-not-disturb mode. 2012-11-08 15:15:27 -08:00
Merov Linden 865cb1b967 Pull merge from viewer-chui 2012-11-08 13:34:57 -08:00
William Todd Stinson a312498260 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-08 12:38:09 -08:00
William Todd Stinson c4eaaa3d6a CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode. 2012-11-08 12:35:15 -08:00
MaximB ProductEngine b8a229032e merging into latest changes 2012-11-08 22:05:01 +02:00
AlexanderP ProductEngine 93f9c69918 CHUI-387 FIXED (Conversation toasts not shown for open conversations when conversation floater is in a minimized state or undocked conversation is minimized): added checking of the minimized state 2012-11-08 17:00:42 +02:00
William Todd Stinson fa85e16d63 Removing unused code. 2012-11-07 17:47:35 -08:00
Merov Linden 4ee2b01b30 Pull from viewer-chui, had to resolve conflicts on llimfloatercontainer.cpp 2012-11-07 17:11:30 -08:00
Merov Linden 87c94625d3 CHUI-468 : Fixed. Final clean up of LLParticipantList, including dependencies. 2012-11-07 16:49:03 -08:00
William Todd Stinson 7701d421e5 CHUI-484: Ensuring that the busy/do-no-disturb message is sent when the user is in the busy/do-not-disturb mode. 2012-11-07 16:48:45 -08:00
Merov Linden 626d07daa1 CHUI-468 : WIP : Clean up LLAvatarList and all sorting code left over in LLParticipantList 2012-11-07 15:36:16 -08:00
William Todd Stinson bfb22638f8 CHUI-514: Updating to Leo's latest icon batch. 2012-11-07 14:12:58 -08:00
William Todd Stinson e73acc8dbd Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-07 10:43:08 -08:00
AlexanderP ProductEngine d1f45654d9 CHUI-473, CHUI-482 FIXED (Clicking on nearby chat toast to open Conversation floater does not show Nearby Chat conversation selected in list; Nearby chat conversation is not selected in list by default when it is the only conversation ): implement. new logic in LLIMFloaterContainer for the syncronous select the conv. list's item and corresponding convers. floater; removed floater selecting from conv. items; fixed bug with item select 2012-11-07 18:45:02 +02:00
Oz Linden 42b9001e97 Added tag 3.4.2-beta2 for changeset e664473c16df 2012-11-07 11:33:13 -05:00
Oz Linden 2f7ef7e63e tag merge of DRTVWR-216 2012-11-07 10:28:58 -05:00
MaximB ProductEngine 4ec5ee63e2 CHUI-450 (Your own name does not appear in nearby chat participant list if voice chat disabled) 
Added audio module initialization without faking mVoiceEnabled value
 2012-11-07 12:07:52 +02:00
Merov Linden 8c64fbf1b7 CHUI-468 : WIP : More cleanup and fix of the participants sorting in LLIMConversation 2012-11-06 18:32:45 -08:00
William Todd Stinson 18011db7f0 Altering the line item phone icon. 2012-11-06 15:47:08 -08:00
MaximB ProductEngine 990a8c6085 CHUI-462 (Torn-off Nearby Chat can't be closed) 2012-11-06 22:44:22 +02:00
William Todd Stinson 6291762bc4 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-06 12:13:45 -08:00
maksymsproductengine 8828eb21e2 CHUI-448 FIXED p2p IM chat conversations show a participant list with a carat 2012-11-06 22:02:09 +02:00
AlexanderP ProductEngine a337d7e597 Fixed postBuild() for Ad-hoc conference 2012-11-07 12:47:00 +02:00