summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-02MergeDave Parks
2010-12-02SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. ↵Dave Parks
Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02mergeMonroe Linden
2010-12-02mergeMonroe Linden
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-30SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for ↵callum
viewer web apps
2010-11-19merge fix for STORM-616Oz Linden
2010-11-19Changed Sit Down shortcut definition and reordered menu slightly.Jonathan Yap
2010-11-18STORM-576 FIXED Hooked up code to preference that allows users to enable ↵Andrew Productengine
double-click to teleport or use auto-pilot. - Added dirty flag that is set true when user changes checkbox or chooses one of radiobuttons connected to double-click action. No change of user settings happens on this commit, because user may press cancel or close floater. If user presses OK, and flag is true, user changes are applied to settings. If user clicks cancel or closes floater, controls are reverted to the state they were before changes, using settings to determine it. - Removed double-click action menu items and code that handled them to avoid functionality duplication and synchronization problems.
2010-11-15mergeRichard Linden
2010-11-08MergeLoren Shih
2010-10-27Automated merge from viewer-development-shiningLoren Shih
2010-10-27Automated merge up from viewer-developmentLoren Shih
2010-10-26fix for destination guide and avatar picker hints not disappearing when ↵Richard Linden
opening destination guide/avatar picker respectively
2010-10-26STORM-418 : Suppress menu items Save to XML and Load from XML from the ↵Merov Linden
Develop > XUI menu
2010-10-26Automated merge up from viewer-developmentLoren Shih
2010-10-25STORM-173 : use isEmpty() instead of getFirstRootNode() to check selectionMerov Linden
2010-10-22EXP-273 FIXED Add button/tray for avatar pickerRichard Linden
made "toggleable" radio group
2010-10-21EXP-273 WIP added avatar picker popup and hintRichard Linden
2010-10-21STORM-173 : never enable return object if no object selectedMerov Linden
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-06EXP-156 WIP Implement custom Skylight hintsRichard Nelson
2010-10-04Automated merge up from viewer-developmentLoren Shih
2010-09-30Code changes for "EXP-126 Create destination guide popup at bottom of screen"callum
2010-09-30MergeMatthew Breindel (Falcon)
2010-09-29added show inspector menu callbacksRichard Linden
2010-09-27MergeLeyla Farazha
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-21SH-178 FIXED As a non-god, I don't want to see admin optionsLoren Shih
Admin options are now enabled by a debug setting.
2010-09-17EXP-60 Hints not showing after Re-enabling Hints in same sessionRichard Linden
2010-09-16mergeRichard Linden
2010-09-16MergeLeyla Farazha
2010-09-10EXP-24 FIX Menu disable all viewer hintsRichard Nelson
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-31mergeDave Parks
2010-08-28MergeAimee Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-26Sync with viewer-developmentMerov Linden
2010-08-26VWR-20715 Double-click teleportAimee Linden
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2 By Twisted Laws and Thickbrick Sleaford
2010-08-25mergeDave Parks
2010-08-25VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patchMerov Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.