summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-11-28CHUI-548: Now a p2p conversation is aligned with the nearby chat arrow. Just ↵Gilbert Gonzales
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-27merging in latest changesGilbert Gonzales
2012-11-27mergeMaximB ProductEngine
2012-11-26CHUI-529: Post code review changes. When showing a floater using ↵Gilbert Gonzales
LLFloater::showInstance() instead of setVisibleAndFrontmost(). Also made setVisibleAndFrontmost() public since both setVisible and setFrontmost are public functions.
2012-11-26CHUI-528, CHUI-536, CHUI-538, CHUI-540: Fixed the changed item's ↵Merov Linden
highlighting that broke multiselection in inventory and in conversations.
2012-11-26Pull merge from richard/viewer-chuiMerov Linden
2012-11-26merging in latest changes, resolved llimview.cpp conflictGilbert Gonzales
2012-11-26CHUI-542 (Torn off message in conversation panel is not cleared when torn ↵MaximB ProductEngine
off conversation is closed)
2012-11-23CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of ↵AlexanderP ProductEngine
different types of notifications): clean up code
2012-11-23CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of ↵AlexanderP ProductEngine
different types of notifications): include flashing for the nearby chat
2012-11-23CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of ↵AlexanderP ProductEngine
different types of notifications): changed item's highlighting
2012-11-23CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of ↵AlexanderP ProductEngine
different types of notifications): repaired LLFlashTimer
2012-11-23CHUI-530 FIXED Don't switch to new conversation automaticallymaxim@mnikolenko
2012-11-23Additional fix for CHUI-490 (Show "Display Name (user.name)" for the user ↵maxim@mnikolenko
that is calling)
2012-11-21CHUI-429 : Completed this though it still doesn't work on Nearby Chat.Merov Linden
2012-11-21Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-21CHUI-429, CHUI-511, CHUI-388 : Multiselection and menus in torn off dialogsMerov Linden
2012-11-21Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-21mergeMaximB ProductEngine
2012-11-21CHUI-523 Additional fixmaxim_productengine
2012-11-21CHUI-533 FIXED Check that mConversationsRoot is not nullmaxim_productengine
2012-11-21CHUI-535 (Starting a conversation with a user that you have an existing ↵MaximB ProductEngine
conversation with can cause the conversation list and message panel to be out of synch) fixed
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-21CHUI-531 FIXED Poor fps in CHUI viewermaksymsproductengine
2012-11-20CHUI-528, CHUI-536, CHUI-538, CHUI-540 Built single processor of different ↵AlexanderP ProductEngine
types of notifications
2012-11-20CHUI-522 FIXED Implement check box item 'Keep a conversation log and transcript'maksymsproductengine
2012-11-20CHUI-490 FIXED Small ui changes. Changed sound that is playing when floater ↵maxim_productengine
is opened. Call startIM() when user clicks on "Open IM instead" button.
2012-11-20CHUI-523 FIXED Set visibility of warning message depending on combobox state.maxim_productengine
2012-11-20CHUI-447 Additional fix(Show only display name for user that starts ↵maxim_productengine
conversation )
2012-11-20CHUI-539 FIXED Chat FUI button flashes indefinitely if Icons Only setting is ↵maksymsproductengine
selected for the button display
2012-11-20CHUI-487, CHUI-488 Commented out demoAlexanderP ProductEngine
2012-11-19CHUI-470 : Fixed : Enable contextual menu in torn off conversationsMerov Linden
2012-11-19CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not possible ↵AlexanderP ProductEngine
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-20mergeMaximB ProductEngine
2012-11-19CHUI-495: Ensuring that a user in do-not-disturb mode can receive voice ↵William Todd Stinson
calls from current conversations.
2012-11-19merge changes for DRTVWR-245Oz Linden
2012-11-19CHUI-488 ADD. fIX Clean up codeAlexanderP ProductEngine
2012-11-19CHUI-487 ADD. FIX (Revised comments)AlexanderP ProductEngine
2012-11-19CHUI-434 (Don't display phone icon and disable phone button when voice isn't ↵MaximB ProductEngine
enabled)
2012-11-19 CHUI-423 (User typing /me something in chat does not show correctly in ↵MaximB ProductEngine
italics on outgoing or incoming chat)
2012-11-17Merge pull from richard/viewer-chuiMerov Linden
2012-11-17CHUI-479 : Clean up unecessary tracking codeMerov Linden
2012-11-16CHUI-479 : Fixed : Rebuild the root on the LLFloaterIMSession when modifying ↵Merov Linden
the session ID
2012-11-16merging in latest changesGilbert Gonzales
2012-11-16CHUI-529: Now the conversations floater will appear when the chat preference ↵Gilbert Gonzales
is set for friend, non-friend, conference, group and nearby chat.
2012-11-16CHUI-518: FIX Removing the LLIMMgr::getInstance() as the containing method ↵William Todd Stinson
is already a non-static member method of the same class.
2012-11-16CHUI-487, CHUI-488 FIXED (Enable flashing FUI button behavior and Implement ↵AlexanderP ProductEngine
Flashing Conversations panel line item behavior): implemented FUI button flashing; clean up code
2012-11-16Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-16CHUI-479 : WIP : Tracing of LLIMModel::processSessionInitializedReply (to be ↵Merov Linden
deleted).
2012-11-16merging in latest changesGilbert Gonzales