summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-12-04Pull merge from richard/viewer-chuiMerov Linden
2012-12-04Pull merge from richard/viewer-chuiMerov Linden
2012-12-04CHUI-550, CHUI-551 : Fixed : Changed conversation sorting according to ↵Merov Linden
designer's desires.
2012-12-04Mergingmaxim@mnikolenko
2012-12-04CHUI-530 FIXED Using selectConversationPair will show appropriate session ↵maxim@mnikolenko
floater.
2012-12-04mergingMaximB ProductEngine
2012-12-04CHUI-527 FIXED Changed term to "Multi-person chat"maxim@mnikolenko
2012-12-04CHUI-573 FIXED Notification chiclet shown when object chiclets are shownmaksymsproductengine
2012-12-03merging in latest changesGilbert Gonzales
2012-12-03CHUI-571: Now when the 'Chat Preference' is set to 'Open Conversations ↵Gilbert Gonzales
window' the conversation line item with flash. The only time it does not flash is when the the conversation line item is already focused. Also fixed various focusing bugs when navigating between conversations and participants.
2012-12-03CHUI-532 FIXED (Viewer crash when user in conversation is removed from ↵AlexanderP ProductEngine
participant list because they logged out or teleported away) delayed destroy of the timer
2012-12-03CHUI-556 (Tooltip on call button incorrect when call is active)MaximB ProductEngine
2012-12-03CHUI-432 (User that is muted in group call does not show as muted to other ↵MaximB ProductEngine
users in conversation list)
2012-11-30CHUI-406 : Fixed again : Update of the P2P session name when not initiating ↵Merov Linden
a session was wrong. Add getting the participant name from the session.
2012-11-30Pull merge from richard/viewer-chuiMerov Linden
2012-11-30CHUI-404, CHUI-406 : Fixed : update ad-hoc conversation when participant ↵Merov Linden
logs off, update title of ad-hoc and P2P to be consistent with torn off and input field
2012-11-30CHUI-570 : Delete a stray debug comment log.Merov Linden
2012-11-30CHUI-570 : Fixed : Take the typing state when updating the title, also make ↵Merov Linden
refresh update less frequent (perf).
2012-11-29Pull merge from richard/viewer-chuiMerov Linden
2012-11-29CHUI-552 : Fixed : Filter out participant creation with the same id than the ↵Merov Linden
session id
2012-11-29CHUI-489: Removed the 'Group Messages' checkbox. This was a design change in ↵Gilbert Gonzales
the spec.
2012-11-28Pull merge from richard/viewer-chuiMerov Linden
2012-11-28CHUI-552 : Fixed : Do not update the avatars sorting when updating the ↵Merov Linden
speaking indicator, let the conversation list do that.
2012-11-29CHUI-553 FIXED Remove the conversation chicletmaksymsproductengine
2012-11-28CHUI-552 : Big clean up in nearby chat making it more consistent with ↵Merov Linden
LLFloaterIMSessionTab
2012-11-28code cleanup: variables and functions were using the word 'minimized' to ↵Gilbert Gonzales
refer 'collapsed'. Renamed variables and functions to use the word 'collapsed' instead of 'minimized'.
2012-11-28merging in latest changesGilbert Gonzales
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-28CHUI-546 FIXED Blank IM toast shown when a nearby chat toast is shown:AlexanderP ProductEngine
Prosessing of the nearby chat was exluded from on_new_message()
2012-11-27merging into latest changesMaximB ProductEngine
2012-11-27merging in latest changesGilbert Gonzales
2012-11-27CHUI-544 (Legacy name shows in conversation list for user that answers a ↵MaximB ProductEngine
voice call)
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-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-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