summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2010-08-28MergeAimee 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-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-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-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
2010-06-16web browser test should always use internal browserRichard Nelson
2010-06-15removing fullscreen functionalityLeyla Farazha
reviewed by richard cc#212
2010-06-05merge from viewer-publicTofu Linden
2010-06-04AVP-44 VWR-19699 FIX Multi-wearables and wearable replacement logicNyx (Neal Orman)
Cleaned up a few things upon code review. Code reviewed by vir for this checkin as well as following previous commits: a801af3728ee af42810b946c
2010-06-03AVP-44 WIP Multi-wearables architectureNyx (Neal Orman)
One step closer to full support of multi-wearables architecture code will be reviewed before pushing.
2010-06-03merge from viewer-publicTofu Linden
2010-06-02EXT-7600 FIX Context menus for line editors don't work on login screenRichard Linden
initialize edit menu callbacks earlier
2010-05-28merge from viewer-publicTofu Linden
2010-05-27EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIPNyx (Neal Orman)
Final fixes for: EXT-7209 camera to enter appearance edit mode EXT-7366 change camera to face front of avatar in previews EXT-7213 kill old appearance editor Partial fix for: EXT-7392 alpha mask checkboxes are not hooked up All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin: 425d4e960450 15d04b6464a7 e92ae606de12 adc94512ea9b 24577dbbf7a4 6f28b241eae2 (sorry dessie! :) )
2010-05-26 EXT-7213 WIP kill old appearance editor and traces of codeNyx (Neal Orman)
Removed last remaining references to gFloaterCustomize. Next step: kill the files themselves. Will be reviewed when complete, before pushing
2010-05-26merge from viewer-publicTofu Linden
2010-05-25EXT-7142 FIXED Upload functionality duplicated in the Build menu and Select ↵Andrew Polunin
Linked Parts menu moved up - LLPanelMainInventory::setUploadCostIfNeeded() - uncommented the line which enables retrieving of the upload cost price using LLGlobalEconomy class. - Implemented LLUploadCostCalculator event handler in the llviewermenu.cpp (the fact that it should be implemented in this file was discussed with Mike Antipov). - LLUploadCostCalculator::calculateCost() is implemented only for code readability: it's name is more descriptive than a code snippet placed directly in the constructor (LLPanelMainInventory::setUploadCostIfNeeded() works in similar way: it calculates cost_str only once). - 'Select Linked Parts' menu was moved below 'Edit Linked Parts'. - 'Upload' menu was added at the bottom, below 'Options' menu Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/425/ --HG-- branch : product-engine
2010-05-24EXT-7461 move/remove deferred rendering UI from prefsTofu Linden
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-21EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" modeNyx (Neal Orman)
Avatar now enters "appearance editing" mode when opening the outfit or wearable editors in the sidepanel. Changed code to ensure we don't accidentally switch out of it and back in when switching from one to the other. Note that this cuts out LLFLoaterCustomize from being built and shown to the user from any UI. The code for this (and related classes) will be removed once we have pulled any code out of it that we still need. The current outfit and wearable editors should be working sufficiently for most purposes. Bugs should be reported to Nyx Linden or the avatar team. Code reviewed by Vir
2010-05-20merge from PE's viewer-trunkTofu Linden
2010-05-19AVP-44 WIP Back-end support for multiwearablesNyx Linden
Changed a lot of areas of code that were not dealing with multiwearables properly. Little functionality changed, as the support mechanisms that were out of date were subtle, but getting closer to no further areas of code that don't properly support multi-wearables. Code reviewed by Vir.
2010-05-19EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context ↵Vadim Savchuk
menu and made it open the shape editing panel. Again, as in EXT-7241, I tried to improve the way the appearance panels (outfits / edit outfit / edit wearables) are switched, this time aiming to eliminate redundant time-consuming operations (fetches/updated/etc). I'm not particularly satisfied with the resulting code but it seems to work. A better solution might be to wrap the panels with LLSideTrayPanelContainer. Additional minor changes: - Fixed unsafe pointer cast in LLSidepanelAppearance::editWearable(). - Removed redundant onEditOutfitButtonClicked() and onEditWearBackClicked() methods from LLSidepanelAppearance. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/395/ --HG-- branch : product-engine
2010-05-15EXT-7241 FIXED Changed all "Edit Appearance" links to "Change Outfit" and ↵Vadim Savchuk
pointed them to the My Outfits tab. Renamed the following menu items to "Change Outfit" and made them open My Outfits tab: - Avatar in-world context menu -> My Appearance. - Avatar inspector menu -> My Appearance. - Me -> My Appearance. To enable the Appearance SP switch to My outfits I cleaned up the logic of switching between my outfits <-> edit outfit <-> edit wearable panels. Also done the following cleanups and minor improvements: - Removed unused LLSidepanelAppearance::mEditBtn and mLookInfoType members. - Removed empty LLSidepanelAppearance::updateVerbs() method. - Made the "params" argument of LLSideTray::showPanel() and togglePanel() optional. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/389/ --HG-- branch : product-engine
2010-05-11DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-05-11EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableTypeLoren Shih
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design. This required a lot of superficial changes across many files. Overall functionality has not changed.
2010-05-04Automated mergeRoxie Linden
2010-05-03EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by davep.Karl Stiefvater (qarl)
2010-04-19automated merge with trunkRoxie Linden
2010-04-07Automated mergeRoxie Linden
2010-04-07automated mergeLoren Shih
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 10:23:04 +0000