summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
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-17(final?) hairy merge from viewer-release to viewer-publicTofu Linden
2010-08-16Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-13mergeBrad Payne (Vir Linden)
2010-08-13DEV-52580 FIXBrad Payne (Vir Linden)
2010-08-13EXT-8662 FIXED Crash on renaming incomplete inventory items.Vadim Savchuk
I couldn't reproduce this problem, but from what I've seen in the crash reporter, this is a very old bug affecting viewers 1.2x and 2.x. When user tries to rename an incomplete inventory item, viewer crashes. The fix is to disallow renaming incomplete items. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/857/ --HG-- branch : product-engine
2010-08-13EXT-8650 Can wear multiple copies of no-copy item via object linksLoren Shih
* EXT-8688 Automatically detach same object is detected * EXT-8689 Cleanup detachAttachmentIntoInventory code When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().Sergei Litovchuk
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point. Worked around by checking gAgentAvatarp for being valid. I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/. --HG-- branch : product-engine
2010-08-09EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().Vadim Savchuk
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point. Worked around by checking gAgentAvatarp for being valid. I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/ --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-26EXT-8918 FIXED Incorrect right-click options for library itemsLoren Shih
Library items have "Share" disabled.
2010-07-26EXT-8229 FIXED Add "--no options--" automatically instead of special casing ↵Loren Shih
for it in right-click menus Changed logic so that the menu is post-processed and, at that time, nooptions is added if the menu is seen to be empty.
2010-07-20EXT-8448 FIXED [crashhunters] Crash in LLFolderBridge::folderOptionsMenu(), ↵Loren Shih
and Trash folder options incorrect Minor fix to previous checkin for this crash. This fixes the UI issue where you're seeing the context options for the previous folder you clicked when you click on trash/library.
2010-07-19EXT-8448 FIX [crashhunters] Crash in LLFolderBridge::folderOptionsMenu()Richard Linden
reviewed by Callum
2010-07-15EXT-8373 FIXED Fixed translation of attachment points in "Attach..." / ↵Vadim Savchuk
"Attach To..." menus (AE and inventory). There is an on_enable callback set for the menu items. It tries adding a suffix like "(obj_name)" if there is already an attachment on the attachment point. No matter whether the suffix has been actually added, the callback resets the menu item label to its parameter (cbparams["label"]). The problem was that we passed the original English attachment point name to the callback, that set it as the menu item name, thus screwing up translation. The fix is to pass translated attachment point name to the on_enable callback. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/768/ --HG-- branch : product-engine
2010-07-09automated mergeLoren Shih
2010-07-08EXT-8292 FIXED Folder wear options disabled in expanded menu on first ↵Loren Shih
right-click EXT-8261 FIXED 'Share' item is disabled in 'My Inventory' folder's context menu Items can now be appended to menus (versus menus being the most restrictive out of all the item choices).
2010-07-08EXT-8269 FIXED "Copy and Wear" from in-world object doesn't wear bodypartsLoren Shih
EXT-8139 FIXED "Copy and wear" when unboxing an outfit defaults to "add" instead of "replace items" Copy&Wear now takes off all inventory item before wearing new outfit.
2010-07-08EXT-8243 FIXED Replaced method to create link in COF with top-level ↵Mike Antipov
LLAppearanceMgr::wearItemOnAvatar() method while DnD a wearable to COF. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/714/ --HG-- branch : product-engine
2010-07-06EXT-8252 FIXED Folders can be dragged into OutfitsLoren Shih
Fixed logic to disallow folders from being dragged into outfits. Also added a bunch of low-risk superficial cleanup such as comments, better local variable declaration, etc.
2010-07-06automated mergeLoren Shih
2010-07-06EXT-8244 FIXED Not wearable links could be added to COF by drag-n-drop in ↵Loren Shih
the Inventory Fixed the dnd behavior so that you can only drag appropriate items into the COF or Outfits folder. Did a bit of superficial code cleanup in terms of adding comments and relocating blocks of code. The actual coding fix was pretty small despite the diff; most of the diff is superficial cleanup.
2010-07-02EXT-8213 FIX users cannot replace their shape if it does not loadNyx (Neal Orman)
Removed checking for wearables loaded on replacing or adding individual items. After reviewing the code in depth, we believe this is safe to do, particularly since we allow the user to replace their outfit from the same state. Filed a followup issue for later investigation EXT-8231 Code reviewed by Vir and Seraph
2010-07-02EXT-8198 Incorrect right-click options for library foldersLoren Shih
Only adding "--no options--" when right-click context menu is empty. Normal priority bug but rather annoying visually.
2010-07-01EXT-8197 FIXED Can't select mixed group of wearables and objects for "Wear"Loren Shih
2010-06-28EXT-8033 FIXED Selecting multiple inventory items can give incorrect ↵Loren Shih
right-click context menus EXT-8093 FIXED No "open" or "properties" items for gestures Re-added open/properties to gestures Fixed right-click inventory selection so that it does something logical & consistent for multiple items. Had to add a "getLastVisible" to LLView to support this.
2010-06-24EXT-7747 FIXED Turn on multiattachments for 2.1 as debug settingLoren Shih
This #ifdef is now keyed to MultipleAttachments debug setting
2010-06-11EXT-7779 FIXED Changed wearing panel from inventory panel to a flat list ↵Sergei Litovchuk
similar to My Outfits view. - Added common interface for My Outfits and Wearing tabs. - Changed LLPanelOutfitsInventory to use common interface for My Outfits and Wearing tabs. - Removed dependency on outfits side panel from inventory bridge context menus. - Removed unused LLShowCreatedOutfit class from llagentwearables.cpp. - Restored opening newly created outfit in My Outfits tab. - Fixed worn items indication for Wearing tab items. Revieved by Neal Orman at https://codereview.productengine.com/secondlife/r/604/. --HG-- branch : product-engine
2010-06-18Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-06-17Fix for EXT-6277 ("Edit" right-click inventory item does nothing if item is ↵Monroe Linden
not worn). Reviewed by Leyla.
2010-06-17EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items ↵Vadim Savchuk
to be enabled when appropriate and work properly. Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options: - The menu items of the outfit context menu and the My Outfits gear menu are now disabled when inappropriate instead of being hidden. - The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit. (was: depending on whether you're wearing the outfit) - Changed the way the options work: they now only operate on clothes and attachments. "Add to COF" now only adds those body parts that are missing in COF; "Remove from COF" doesn't touch body parts at all. Without this change both "Add" and "Remove" options would be available simultaneously, because any valid outfit contains body parts. I think that would be confusing. And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement) Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/ --HG-- branch : product-engine
2010-06-16EXT-7834 fixed corruption of menu item vectorsgabriel lee
reviewed by Richard
2010-06-15EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.Loren Shih
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-10automated mergeLoren Shih
2010-06-10EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Changed folder icon logic to use LLViewerFolderType (as it should always been doing).
2010-06-09EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Took out explicit _Link icons and replaced with overlay. Removed links overlays from non-main-inventory-floater panels.
2010-06-09EXT-6726 ADDITIONAL FIX Minor code cleanup.Vadim Savchuk
Removed duplicated code from LLFolderBridge::isItemRenameable(). Requested by Richard at https://codereview.productengine.com/secondlife/r/466/ --HG-- branch : product-engine
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-06-03VWR-19699 WIP Correct operations for wear and replace on wearablesNyx (Neal Orman)
Resident-submitted patch, cleaned up so it matches style and compiles/builds well. Appears to work for stated goals but will need some more UI work to ensure consistency. WIP checkin, will be code reviewed before pushing.
2010-06-03EXT-7429 FIXED Removed itallicise \"worn\" objects in inventory panelsPaul Guslisty
- Added checking in LLItemBridge::getLabelStyle() if item is worn - Also deleted unnecessary method LLObjectBridge::getLabelStyle() as it duplicate LLItemBridge::getLabelStyle() Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/501/ --HG-- branch : product-engine
2010-06-02EXT-6726 WIP Added more menus to the Appearance SP.Vadim Savchuk
Done: - Implemented creating new wearables via My Outfits gear menu. - Implemented renaming/removing/editing an outfit via My Outfits context menu. - Implemented "Attach to..." / "Attach to HUD..." context submenus. - Now disabling (instead of hiding) irrelevant wearable context menu items. - Added "Take Off / Detach" context menu item that's shown for clothes and attachments. Useful if you selected a bunch of items and want to take them all off. - Fixed taking off an outfit (not all wearables were taken off because of a wrong inventory collector). - Fixed crash when editing a skirt (reference to a missing string). - In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables and introduced MASK_UNKNOWN per Nyx's request. Known issues: - "Attach to..." context menus may be displayed partially off-screen (there is the same bug in the inventory panel). - The way we invoke wearable editing panel after the wearable gets created is currently a hack. TODO: - Wear / take off / rename / delete an outfit via My Outfits gear menu (currently not implemented because of missing selection support in My Outfits). - Add "Create new..." to body part / clothing context menu in Edit Outfit. - Add "Create new..." submenus to the Edit Outfit gear menu. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/ --HG-- branch : product-engine
2010-06-02EXT-2704 FIXED added custom inventory folder iconsIgor Borovkov
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/488/ --HG-- branch : product-engine
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-26EXT-7213 WIP kill old appearance editor and all traces of codeNyx (Neal Orman)
part 2 - correcting a few points that would have broken the build. Final version will be reviewed before pushing.
2010-05-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
indra/newview/llinventorybridge.cpp LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 10:57:22 +0000