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

25945 Commits (2ce98c8b14d86bb5c8078c762bfc32b6fc4d8346)

Author SHA1 Message Date
AlexanderP ProductEngine 2ce98c8b14 CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): include flashing for the nearby chat 2012-11-23 15:13:28 +02:00
AlexanderP ProductEngine 01a43d0a04 CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): changed item's highlighting 2012-11-23 15:10:28 +02:00
AlexanderP ProductEngine f37645554c CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): repaired LLFlashTimer 2012-11-23 13:39:53 +02:00
maxim@mnikolenko a83676e1ab CHUI-530 FIXED Don't switch to new conversation automatically 2012-11-23 19:56:59 +02:00
maxim@mnikolenko cbe90ebc9c Additional fix for CHUI-490 (Show "Display Name (user.name)" for the user that is calling) 2012-11-23 19:05:28 +02:00
William Todd Stinson f23e0ffdb2 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-21 16:01:54 -08:00
William Todd Stinson b761235893 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-21 10:42:50 -08:00
MaximB ProductEngine 7f19e6de5c merge 2012-11-21 19:59:51 +02:00
maxim_productengine a4a6e5a17d CHUI-523 Additional fix 2012-11-21 15:26:56 +02:00
maxim_productengine da5792fcec CHUI-533 FIXED Check that mConversationsRoot is not null 2012-11-21 15:14:47 +02:00
MaximB ProductEngine 2dea7a52f6 CHUI-535 (Starting a conversation with a user that you have an existing conversation with can cause the conversation list and message panel to be out of synch) 
fixed
 2012-11-21 12:30:12 +02:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
maksymsproductengine edeeed9541 CHUI-531 FIXED Poor fps in CHUI viewer 2012-11-21 01:41:49 +02:00
AlexanderP ProductEngine 1ece389121 CHUI-528, CHUI-536, CHUI-538, CHUI-540 Built single processor of different types of notifications 2012-11-20 19:17:25 +02:00
maksymsproductengine 3361c9b911 CHUI-522 FIXED Implement check box item 'Keep a conversation log and transcript' 2012-11-20 19:47:56 +02:00
maxim_productengine 81478d6c44 CHUI-490 FIXED Small ui changes. Changed sound that is playing when floater is opened. 
Call startIM() when user clicks on "Open IM instead" button.
 2012-11-20 18:57:29 +02:00
maxim_productengine e52c0218c7 CHUI-523 FIXED Set visibility of warning message depending on combobox state. 2012-11-20 18:40:53 +02:00
maxim_productengine b87974df51 CHUI-447 Additional fix(Show only display name for user that starts conversation ) 2012-11-20 15:18:19 +02:00
maksymsproductengine 668761e119 CHUI-539 FIXED Chat FUI button flashes indefinitely if Icons Only setting is selected for the button display 2012-11-20 13:39:09 +02:00
AlexanderP ProductEngine 380b82c7ee CHUI-487, CHUI-488 Commented out demo 2012-11-20 12:55:38 +02:00
Oz Linden cca22d608d Added tag 3.4.3-beta1 for changeset 94ab2b49458a 2012-11-19 14:41:24 -05:00
AlexanderP ProductEngine 2c2e8b83d0 CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not possible to collapse the right side of the conversation dialog: the toolbar is completely missing and the "<<" chevrons are not there): This was because the button "<<" belonged session's floater and not the container. Therefore, when all the floaters in the stack becomes invisible, their buttons also become invisible. Solution: Added additional button "<<" in the stub_panel of the container. 2012-11-19 19:26:00 +02:00
MaximB ProductEngine 09570f1e38 merge 2012-11-20 06:27:30 +02:00
William Todd Stinson aba409f24f CHUI-495: Ensuring that a user in do-not-disturb mode can receive voice calls from current conversations. 2012-11-19 17:14:18 -08:00
Oz Linden f362666df7 merge changes for DRTVWR-245 2012-11-19 11:31:01 -05:00
Oz Linden 6cd16bc537 tag merge of DRTVWR-245 2012-11-19 11:28:52 -05:00
Oz Linden f99d7bcd47 Added tag DRTVWR-232 for changeset f1d3b3fcab28 2012-11-19 11:25:08 -05:00
AlexanderP ProductEngine 48a683af70 CHUI-488 ADD. fIX Clean up code 2012-11-19 17:40:46 +02:00
AlexanderP ProductEngine c48f8c2b28 CHUI-487 ADD. FIX (Revised comments) 2012-11-19 16:47:40 +02:00
MaximB ProductEngine f043bc32fd CHUI-434 (Don't display phone icon and disable phone button when voice isn't enabled) 2012-11-19 09:08:02 +02:00
MaximB ProductEngine 0cb67ec376 CHUI-423 (User typing /me something in chat does not show correctly in italics on outgoing or incoming chat) 2012-11-19 07:42:39 +02:00
Merov Linden 61f3c1b41d Merge pull from richard/viewer-chui 2012-11-17 15:48:07 -08:00
Merov Linden 2d25eb18ad CHUI-479 : Clean up unecessary tracking code 2012-11-17 13:24:41 -08:00
Merov Linden 249b44d01c CHUI-479 : Fixed : Rebuild the root on the LLFloaterIMSession when modifying the session ID 2012-11-16 21:01:57 -08:00
William Todd Stinson c6a0f0ae1d CHUI-518: FIX Removing the LLIMMgr::getInstance() as the containing method is already a non-static member method of the same class. 2012-11-16 16:17:11 -08:00
AlexanderP ProductEngine e298c2ded8 CHUI-487, CHUI-488 FIXED (Enable flashing FUI button behavior and Implement Flashing Conversations panel line item behavior): implemented FUI button flashing; clean up code 2012-11-16 22:36:12 +02:00
William Todd Stinson d6358e120f Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-16 11:18:22 -08:00
Merov Linden ed3f43aec4 CHUI-479 : WIP : Tracing of LLIMModel::processSessionInitializedReply (to be deleted). 2012-11-16 11:14:12 -08:00
Gilbert Gonzales 4cf894dc77 merging in latest changes 2012-11-16 10:35:40 -08:00
AlexanderP ProductEngine 50b69c3f97 CHUI-487, CHUI-488 W.I.P. #3 (Enable flashing FUI button behavior and Implement Flashing Conversations panel line item behavior): implemented conversation's item flashing 2012-11-16 12:38:40 +02:00
Gilbert Gonzales 987350fcb3 CHUI-489: Code review cleanup for both CHUI-489 and CHUI-486. This should be last commit for CHUI-489. 2012-11-15 19:24:45 -08:00
William Todd Stinson 568d818ffe CHUI-518: WIP First pass as implementing auto-reject voice calls in do not disturb mode. 2012-11-15 19:08:08 -08:00
Merov Linden ec5d1e48c4 CHUI-479 : WIP : Introduce a publicly available LLSpeakingIndicatorManager::updateSpeakingIndicators() method so to reset all indicators when creating new dialogs. 2012-11-15 18:07:57 -08:00
Gilbert Gonzales 89f7335a52 CHUI-489: Found a bug in last commit for this issue. The sound notification (for inventory/teleport offer) would be played for the toast popup as well as once the conversations floater was opened. And also when a button was clicked in the conversation floater to 'accept' or 'deny' the offer. Now only playing the sound notification when the initial offer has been made. 2012-11-15 17:34:34 -08:00
Gilbert Gonzales e775e95416 merging in latest changes 2012-11-15 15:45:02 -08:00
Gilbert Gonzales d3474c6eaf CHUI-489: Now sounds exist for teleport and inventory offers. The sound is specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer. 2012-11-15 15:42:22 -08:00
maksymsproductengine 37d7f46905 CHUI-524: The root reason of crash was in the infinity recursion in the chain of calls LLFloater::setFocus->LLFloater::setFrontmost->LLFloaterView::bringToFront. And problem was not related to CHUI-362. Reviewed by Stinson. 2012-11-15 15:32:02 -08:00
William Todd Stinson e89616aac8 Backed out changeset: 80bab29003f8 Removing hack fix for CHUI-524. 2012-11-15 15:11:22 -08:00
maksymsproductengine 16f5a67e65 CHUI-442 FIXED Nearby chat does not open conversations floater when clicking first nearby chat toast in a session 2012-11-15 23:35:14 +02:00
maxim_productengine 4ea44918dd CHUI-525 FIXED Tootlips are added for Info buttons 2012-11-16 19:36:46 +02:00