summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2011-01-04merge changes for storm-737Oz Linden
2010-12-23STORM-737 Inventory/Recent: Gray out "New Folder" in "+" menu and enable all ↵Jonathan Yap
menu items except "New Folder" when right clicking an item.
2010-12-16STORM-771 FIXED Pasting wearable items from clipboard to Current Outfit or ↵Seth ProductEngine
an outfit folder now creates links to these items.
2010-11-02STORM-283 : merge with viewer-developmentMerov Linden
2010-11-01STORM-287 FIXED changing currnet outfit with an outfit dragged from Library ↵Seth ProductEngine
to My Inventory->Current Outfit folder.
2010-11-01STORM-283 FIXED adding attachments of type LLInventoryType::IT_ATTACHMENT to ↵Seth ProductEngine
Current Outfit.
2010-10-27STORM-296 FIXED Item types that can be dropped to Favorites and Landmarks ↵Seth ProductEngine
restricted to landmarks and folders containing landmarks. This changes affect all folder views. The previous fix affecting only My Landmarks SP (changeset 330d0e96d58d) was reverted.
2010-09-27MergeLeyla Farazha
2010-09-16MergeLeyla Farazha
2010-09-09dummy commit testLoren Shih
2010-09-08dummy commit testLoren Shih
2010-09-08dummy commit testLoren Shih
2010-09-08VWR-22901 FIXED Backwards compatibility for multiattachmentsLoren Shih
Better handling of invalid attachment points. You can now detach points that are incompatible with your viewer, versus having those permanently in the COF>
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-02VWR-22695 FIXED Adding attachments messaging is inefficientLoren Shih
Superficial code cleanup of RezAttachment messaging.
2010-09-01VWR-22695 FIXED Adding attachments messaging is inefficientLoren Shih
Single attachment request are now batched up and sent all at once as a single message.
2010-09-23STORM-199 FIXED Added wearing an object from Library if it was dragged to COFSergei Litovchuk
- Disabled moving items from in-world objects to COF or outfit folders not to create copies of items instead of links. - Enabled dropping a landmark from Library to certain position in Favorites folder which supports items reordering.
2010-09-17STORM-183 ADDITIONAL FIX Disabled the "Replace Current Outfit" option of the ↵Vadim Savchuk
inventory context menu for incomplete outfits.
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-30Merge with dessie/viewer-releaseLeyla Farazha
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-19Merge with dessie/viewer-releaseLeyla Farazha
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-06Merge from dessie/viewer-releaseLeyla Farazha
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