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

25962 Commits (26cf298024455cae7d5f45d030d12129b4a75936)

Author SHA1 Message Date
Gilbert Gonzales 26cf298024 merging in latest changes 2012-11-28 11:37:01 -08:00
Gilbert Gonzales 80f8a465eb CHUI-548: Now a p2p conversation is aligned with the nearby chat arrow. Just had to check for a p2p conversation type and then adjust then decrease the indentation. Also made LLFolderViewItem::drawOpenFolderArrow() a non-virtual function and adjusted code accordingly. 2012-11-28 11:35:59 -08:00
MaximB ProductEngine 407ee5d98f merging into latest changes 2012-11-27 23:21:27 +02:00
Gilbert Gonzales a77a49af45 merging in latest changes 2012-11-27 10:41:46 -08:00
MaximB ProductEngine d9ad200553 CHUI-544 (Legacy name shows in conversation list for user that answers a voice call) 2012-11-27 17:55:50 +02:00
MaximB ProductEngine 5269c6e37c merge 2012-11-27 07:09:06 +02:00
Gilbert Gonzales 4105ae9467 CHUI-529: Post code review changes. When showing a floater using LLFloater::showInstance() instead of setVisibleAndFrontmost(). Also made setVisibleAndFrontmost() public since both setVisible and setFrontmost are public functions. 2012-11-26 19:12:04 -08:00
Merov Linden 1a3c5e574b CHUI-528, CHUI-536, CHUI-538, CHUI-540: Fixed the changed item's highlighting that broke multiselection in inventory and in conversations. 2012-11-26 17:49:16 -08:00
Merov Linden 8076f7a33d Pull merge from richard/viewer-chui 2012-11-26 15:01:57 -08:00
Gilbert Gonzales 14e82732f4 merging in latest changes, resolved llimview.cpp conflict 2012-11-26 14:50:36 -08:00
MaximB ProductEngine a243a0475e CHUI-542 (Torn off message in conversation panel is not cleared when torn off conversation is closed) 2012-11-26 12:24:11 +02:00
AlexanderP ProductEngine 890965faf5 CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): clean up code 2012-11-23 15:14:17 +02:00
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
Merov Linden 7ca2508cc2 CHUI-429 : Completed this though it still doesn't work on Nearby Chat. 2012-11-21 18:15:24 -08: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
Merov Linden a12464b9cb CHUI-429, CHUI-511, CHUI-388 : Multiselection and menus in torn off dialogs 2012-11-21 11:46:38 -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
Merov Linden 834ded33ae CHUI-470 : Fixed : Enable contextual menu in torn off conversations 2012-11-19 18:41:52 -08: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
Gilbert Gonzales a897e69ffc merging in latest changes 2012-11-16 18:53:39 -08:00