summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_viewer.xml
AgeCommit message (Collapse)Author
2010-12-10mergeAndrew Meadows
2010-11-19merge fix for STORM-616Oz Linden
2010-11-19Changed Sit Down shortcut definition and reordered menu slightly.Jonathan Yap
2010-11-18Viewer 2.4 (as of 18 Nov 2010) with STORM-616 (Me/Movement) merged in.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-16Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-16mergeAndrew Meadows
2010-11-15Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-15STORM-318 FIXED The Advanced menu shortcut was broken under Linux.Vadim ProductEngine
Reason: The old shortcut (Ctrl+Alt+D) was eaten by some window managers. Changes: - Changed the shortcut to Ctrl+Alt+Shift+D. - Moved the appropriate menu item from "Advanced > Shortcuts" to "World > Show" (so that it's not in the menu it triggers) and made it visible. The old shortcut is still available but marked as legacy. Submitting on behalf of Boroondas Gupte.
2010-10-29Merge with lindenlab/viewer-developmentKyle Ambroff
2010-10-27Automated merge from viewer-development-shiningLoren Shih
2010-10-26STORM-418 : Suppress menu items Save to XML and Load from XML from the ↵Merov Linden
Develop > XUI menu
2010-10-21Merge with andrewKyle Ambroff
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-11Another merge from http://hg.secondlife.com/viewer-developmentAndrew Meadows
2010-10-04Automated merge up from viewer-developmentLoren Shih
2010-09-27MergeLeyla Farazha
2010-09-27merge storm-173Tofu Linden
2010-09-24STORM-173 : Add Build > Object > Return ObjectMerov 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-16mergeRichard Linden
2010-09-16MergeLeyla Farazha
2010-09-10EXP-24 FIX Menu disable all viewer hintsRichard Nelson
2010-09-10Post-convert merge by convert_monolith.py from ↵Andrew Meadows
http://hg.lindenlab.com/brad/viewer-simconsole
2010-09-07VWR-20713 SUPPLEMENTARY Double-click Teleport. Correct menu item label.Aimee Linden
2010-09-07MergeAimee Linden
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-09-24Pull update from viewer-developmentMerov Linden
2010-09-16STORM-161 : Reimplement hide object selectionMerov 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-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
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.
2010-08-20merge from viewer-releaseTofu Linden
2010-08-18fixed for EXT-8963: investigate if Advanced > Run Multiple Threads should be on.Xiaohong Bao
Removed "Run Multiple Threads" from the menu because we are not using it.
2010-08-19VWR-20724 FIXED Missing underlined shortcuts in some top-level menus.Vadim Savchuk
Some of the menus lacked the underlined shortcut keys because there was no create_jump_keys="true" XML attribute specified for them. I just added the attribute to all menus. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/869/ --HG-- branch : product-engine
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-26EXT-8069 FIXED "Show Advanced Menu" item is moved to "Advanced/Shortcuts" ↵Mike Antipov
submenu and made invisible. (invisible - because it is still located in menu it toggles) Note: We can not completely remove this menu item to keep hot key workable. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/803/ --HG-- branch : product-engine
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-13Merged from viewer-releaseDessie Linden
2010-07-12EXT-7884 (\"Set Default Upload Permissions\" may make more sense in the ↵Andrew Polunin
Upload sub-menu) - In viewer menu 'Set Default Upload Permissions' menu item was moved from 'Options' menu to the 'Upload' menu. - 'Set Default Upload Permissions' menu item was added to the inventory menu. - Removed stray separators. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/734/ --HG-- branch : product-engine
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-15EXT-7348 Can't open Advanced Menu in Linux ClientTofu Linden
Added a new, preferred shortcut for Show Advanced Menu, that isn't eaten by the desktop on Linux. The old shortcut also works.
2010-06-11MergeDessie Linden