summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-06-07Merge : pull from lindenlab/viewer-releaseMerov Linden
2012-06-01Build fixAlexanderP ProductEngine
2012-06-01CHUI-119 FIXED Bug fixed. Clean up a codeAlexanderP ProductEngine
2012-05-31CHUI-119 WIPSeth ProductEngine
2012-05-30Build fixAlexanderP ProductEngine
2012-05-30CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-containerAlexanderP ProductEngine
2012-05-25CHUI-131 FIX Crash when selecting Show on inventory offer notification if ↵Richard Linden
other notifications are being received
2012-05-24CHUI-78 FIXED group actions gear menu in People->Groups.Seth ProductEngine
Used the same menu for groups list context menu and gear menu in People->Groups. Changed the type of groups list context menu to toggleable.
2012-05-21Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiRichard Linden
2012-05-21CHUI-111 FIX Saved notifications are not sorted in same order after logout ↵Richard Linden
and relog. sort notifications in separate list llnotification now uses param block to serialize to llsd
2012-05-21gcc build fix.Seth ProductEngine
2012-05-18CHUI-96 FIX Cannot dismiss modal dialogs related to merchant outboxRichard Linden
notification duplicate suppression now doesn't generate multiple dialogs
2012-05-18Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiRichard Linden
2012-05-18CHUI-112 FIX Clicking Show or Discard in an inventory offer toast does not ↵Richard Linden
dismiss toast removed special case logic for dealing with user online/offline collisions added ability to cancel old duplicate notifications
2012-05-18CHUI-121 FIXED showing chat participants list only in torn off IM floaters.Seth ProductEngine
2012-05-18CHUI-105 WIP Minor code clean up and optimization.Seth ProductEngine
Removed overloaded updateTitleButtons() and moved its functionality to a new method that should be called less frequently.
2012-05-17CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chatAlexanderP ProductEngine
2012-05-17CHUI-105 WIP Implemented collapsed/expanded state transitions for messages ↵Seth ProductEngine
and conversation panes. The states and dimensions of Conversations floater panes are saved in per account settings.
2012-05-15CHUI-105 WIP Hide an additional close button for undocked state of an IM floaterAlexanderP ProductEngine
2012-05-15CHUI-105 WIP Remove obsolete controls from the group's control paneAlexanderP ProductEngine
2012-05-15CHUI-102 WIP Implemented new context menu for ad-hoc and group conferencesAlexanderP ProductEngine
2012-05-14CHUI-113 WIP clean-up (obsolete code was removed)AlexanderP ProductEngine
2012-05-14Formatting fixesAlexanderP ProductEngine
2012-05-14CHUI-113 WIP all voice controls is moved from a IM-control panel to the IM ↵AlexanderP ProductEngine
floater; IMControlPanel is removed; simplified voice button's listener behavior
2012-05-10CHUI-105 WIP Added expand/collapse behavior for Conversations floater ↵Seth ProductEngine
messages pane.
2012-05-09Removed a recursive include declarationAlexanderP ProductEngine
2012-05-08CHUI-103 FIXED Implemented switching text view modes from pop-up menuAlexanderP ProductEngine
2012-05-07CHUI-105 WIP Added tear-off and return behavior for IM floater.Seth ProductEngine
XUI changed for Converstions multifloater and IM floater.
2012-05-07CHUI-103 WIP Added settings for switching text view modeAlexanderP ProductEngine
2012-05-07CHUI-103 Repair drawing messages with prepend new lineAlexanderP ProductEngine
2012-05-04CHUI-103 WIP Added support for showing/hiding timestamp and names, replacing ↵AlexanderP ProductEngine
own name with (You)
2012-05-04merge changes for drtvwr-142Oz Linden
2012-05-04merge changes for drtvwr-140Oz Linden
2012-04-26CHUI-78 WIP Reordered and added missing items for People floater gear menus.Seth ProductEngine
2012-04-26merge changes for drtvwr-140Oz Linden
2012-04-26MAINT-813 FIXED crash when trying to access the region info after viewer ↵Seth ProductEngine
disconnect. Added checks for LLViewerRegion pointer in LLViewerObject being invalid.
2012-04-24FIX INTL-96 Viewer translation for Set31eli
2012-04-24sync with viewer-developmenteli
2012-04-24OPEN-54: correct JsonCpp include pathBoroondas Gupte
2012-04-17DRTVWR-139: merge back 3.3.1-beta2 fixesOz Linden
2012-04-17Mac build fix.Seth ProductEngine
2012-04-16sync with viewer-developmenteli
2012-04-16MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT ↵callum
request from similator and display a notification Reviewed by Simon
2012-04-14DRTVWR-136: Remove redundant remove_(item|category)() functions.Nat Goodspeed
Incoming changes from two different project repos left viewer-development with LLInventoryModel::removeItem() and removeCategory() plus free functions remove_item() and remove_category() in llinventoryfunctions.cpp. remove_category() was actually the better implementation; migrated its body into LLInventoryModel::removeCategory(). Clearly the previous state of affairs -- with LLInventoryModel::removeItem() plus a remove_category() free function in a very different source file -- fooled two different developers into overlooking the other of the pair. Unfortunately we each added different "missing" functions, leaving us with a complete set of four. Fix existing references to remove_item() and remove_category() free functions.
2012-04-13fix merge conflict in remove_itemOz Linden
2012-04-13merge changes for drtvwr-136Oz Linden
2012-04-13merge changes for drtvwr-135Oz Linden
2012-04-12CHUI-87 FIXED crash in handling notifications after viewer disconnect.Seth ProductEngine
Notification handlers now use LLHandles to screen channels.
2012-04-12MAINT-891 FIXED Disabled focus return from modal dialog after viewer logoff.Seth ProductEngine
Fixed boost trackable objects usage.
2012-04-11merge changes for drtvwr-137Oz Linden