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

25412 Commits (1786a7150e754ea10dfd5172ec2491dd67e83a9a)

Author SHA1 Message Date
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
maxim_productengine 5790565ec6 Additional fix for CHUI-473 2012-11-09 19:44:37 +02: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
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
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
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
Gilbert Gonzales 8d9aec9278 merging in latest changes 2012-11-06 17:56:47 -08:00
Gilbert Gonzales 50615ba69c CHUI-507: Updated to the new layout of 'Chat Preferences' according to CHUI Notifications spec. The functionality for the new preferences is not yet implemented. 2012-11-06 17:56:25 -08:00
Merov Linden 2abe0fea5c Pull merge fom viewer-chui-441 2012-11-05 18:34:30 -08:00
Merov Linden 2d9d44e316 CHUI-468 : WIP : Taking LLAvatarList and related out of LLParticipantList 2012-11-05 18:33:39 -08:00
Gilbert Gonzales 37c416dee3 CHUI-479: Problem: The parent folder's view model did not store the session id. Because of this, the speaker indicator would be set to a session id of null (nearby chat). Solution: Now when the folder view model is created in the torn off list, pass in the session id. This allows the folder view model to know which session id it belongs to. Participants can then look at the parent folder (folder view) and retrieve the session id. 2012-11-05 17:39:29 -08:00
Merov Linden e3524a5fe1 CHUI-468 : Suppress LLCallFloater completely 2012-11-05 15:53:31 -08:00
Merov Linden 8d6aaf8e8e CHUI-468 : Suppress LLIMFloater::onParticipantsListChanged(). Not useful anymore. 2012-11-05 13:47:49 -08:00
maksymsproductengine 0a21efc7ab CHUI-374 FIXED Nearby chat is torn off and cannot be docked if nearby chat is received while conversation floater is closed 2012-11-05 17:52:04 +02:00
maxim_productengine 741fdfd3e6 CHUI-502 FIXED deleted registering Call floater from FloaterReg 2012-11-06 14:53:42 +02:00
maxim_productengine 622a697788 CHUI-460 FIXED Reselect current conversation on clicking expand/collapse button 2012-11-06 14:47:01 +02:00
MaximB ProductEngine 6220ce3370 CHUI-450 (Your own name does not appear in nearby chat participant list if voice chat disabled) 2012-11-05 15:18:53 +02:00
Merov Linden 749416fa7f Merge viewer-hui-441 2012-11-04 08:37:07 -08:00
Merov Linden 7c7cc56b03 Pull merge from richard/viewer-chui 2012-11-03 20:44:00 -07:00
Merov Linden 00da007acd Pull merge Gil's changes 2012-11-02 19:37:44 -07:00
Merov Linden 4da02c26e1 CHUI-481, CHUI-404, CHUI-405, CHUI-406, CHUI-407, CHUI-408 : Fixed! Change the way Ad-hoc and P2P chats update their session name in a way which is consistent and honor display name. 2012-11-02 19:36:46 -07:00
Gilbert Gonzales 7e74481f33 This does not pertain to a CHUI bug fix but Richard took a look at the behavior of the layout stack test and found a mathematical bug that caused panels in a layout stack to jitter as they were resized. Submitting in this branch. 2012-11-02 18:00:19 -07:00
William Todd Stinson 3b39ec165a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-02 17:56:35 -07:00
Gilbert Gonzales 4f6afb08d7 CHUI-472: This is a fix for the following case: When a torn off floater has its conversation reduced to the minimum width, once re-docked the conversation does not expand. Solution: Discussed problem with Richard, and I'm submitting the changes required to fix the problem. 2012-11-02 16:22:19 -07:00
William Todd Stinson 6e2b3527cc CHUI-475: Ensuring that objects that query the avatar name cache with a callback store the connection and disconnect on object destruction. This should help resolve some of the heap corruption we are seeing. 2012-11-02 13:22:48 -07:00
Oz Linden 1f305e8624 Added tag 3.4.1-beta12 for changeset 3f9be82de642 2012-11-02 14:58:18 -04:00