summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2010-10-21STORM-173 : never enable return object if no object selectedMerov Linden
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-11Another merge from http://hg.secondlife.com/viewer-developmentAndrew Meadows
2010-10-06EXP-156 WIP Implement custom Skylight hintsRichard Nelson
2010-10-04Automated merge up from viewer-developmentLoren Shih
2010-09-30STORM-1126 WIP Windlight Estate Settings port from 1.23: second pass at ↵Nyx (Neal Orman)
getting windlight ported to V2. Lots of cleanup in the floater classes. Not sure every decision was correct but it compiles now. Doesn't link yet. (resubmitted by Vadim ProductEngine)
2010-09-30Code changes for "EXP-126 Create destination guide popup at bottom of screen"callum
2010-09-29added show inspector menu callbacksRichard Linden
2010-09-27STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at ↵Nyx (Neal Orman)
merging in windlight estate settings to viewer-dev codebase. not built, not tested. Probably needs a bunch of fixes to be able to be integrated. (resubmitted by Vadim ProductEngine)
2010-09-27MergeLeyla Farazha
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-10Post-convert merge by convert_monolith.py from ↵Andrew Meadows
http://hg.lindenlab.com/brad/viewer-simconsole
2010-09-08automated mergeLoren Shih
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-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-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.
2010-08-24merge heads. whew.Tofu Linden
2010-08-23First pass commit for breast physics.Loren Shih
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12merge from viewer-releaseTofu Linden
2010-08-11EXT-8650 Can wear mutliple copies of a no-copy item via object linksLoren Shih
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code Lots of files changed, but this is mostly just a trivial function call rename. This change is very low risk.
2010-08-10Fix for crash when deferred rendering enabled and toggling wireframe.Dave Parks
(transplanted from 3886dff9a2829c7a8957d2cc48742e0678ec06a6)
2010-08-09EXT-8577 FIXED Context menu items for multi-attachmentsVadim Savchuk
Changes: * Implemented bulk-add from My Appearance SP. * Made sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). I stated that in comments. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/844/ --HG-- branch : product-engine
2010-08-06EXT-8577 WIP Context menu items for multi-attachments.Vadim Savchuk
Done: - 1. Dropped the obsolete "MultipleAttachments" setting. - 2. Added an "Add" item to the following attachment-related context menus: * My Appearance (ex-My Outfits) context menu. * Edit Outfit -> Add More context menu. * Object in-world context menu. * Inventory context menu. * Object inspector gear menu. - 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action. TODO: - Ability to attach multiple objects at once from the Add More panel (bulk attach). - Make sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). Issues: 0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments() should replace attachments or add them. Assumed the former. 1. I couldn't verify that adding objects from the object inspector menu works because I either could wear an object or see its inspector, not both. 2. > 1. Right-click on an object in your inventory and select "Wear". > VERIFY: Attaches the object and replaces whatever's there; asks for > confirmation before replacing an existing object. I think this is impossible to implement because we don't know in advance what point the object will be attached to, so we can't display a confirmation dialog. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/ --HG-- branch : product-engine
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-07-29EXT-8501 FIXED Check menu items always looked as checked.Vadim Savchuk
Reason: Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark. Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string. Fix: Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/821/ --HG-- branch : product-engine
2010-07-23EXT-6739 FIXED Provided updating of object inspector gear menu 'Touch' and ↵Alexei Arabadji
'Sit' entries. Details: 1 Provided using Object.EnableSit and Object.EnableTouch callbacks for both object menu and inspector gear menu. Now default menu item label stores in hash map and since callback receives triggered control no need to hardcode updating menu item labels from callback. 2 Removed redundant attribute 'parameter' from menu xml's since now handler callbacks receives triggered menu item as function parameter. 3 Replaced LLObjectEnableTouch class with enable_object_touch function, since there no need on triggering callback on menu commit event. 4 Added symmetric method LLMenuItemGL::getValue(). 5 Removed unused "Object.EnableGearSit" callback. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/774/ --HG-- branch : product-engine
2010-07-30merge from viewer-releaseTofu Linden
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-07-20mergeRichard Nelson
2010-07-15EXT-8385 FIXED Fixed simultaneous availability to click "Sit here" and ↵Andrew Dyukov
"Stand Up" on object. Made only one of them enabled in the same time, didn't make disabled one invisible because it was decided so in EXT-8094. - This bug is the result of EXT-8094 fix. Corrected logic of enabling "Sit here" and "Stand up" both in xml and code. - Removed class LLObjectEnableSitOrStand because it's not needed anymore, and it's handleEvent() method duplicates is_object_sittable() function. - Renamed Object.EnableSit to Object.EnableGearSit because its name is now used for enabling object menu sit, and this "simple" version is used only from object inspector's gear menu. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/761 --HG-- branch : product-engine
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-18EXT-5808 FIXED Added another context menu. Also Navigation Bar and ↵Andrew Polunin
Mini-Location bar are mutually exclusive now - Implemented context menu for Mini-Location bar (menu_topinfobar.xml) - Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar. - Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa). - Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/ --HG-- branch : product-engine
2010-06-17mergeDave Parks
2010-06-17MergeLeyla Farazha
2010-06-17EXT-7297 Viewer does not verify that a user has sufficient L$ when buying ↵Leyla Farazha
"contents" of an object reviewed by richard, cc Review #217
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 10:08:10 +0000