Commit Graph

335 Commits (cd2b9b45faa6dfd7a4c4e72fbe5395de8ad8f98d)

Author SHA1 Message Date
Sergei Litovchuk 73db0816e0 STORM-199 FIXED Added wearing an object from Library if it was dragged to COF
- 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-23 01:34:51 +03:00
Vadim Savchuk 8eb6c6dec8 STORM-183 ADDITIONAL FIX Disabled the "Replace Current Outfit" option of the inventory context menu for incomplete outfits. 2010-09-17 22:52:51 +03:00
Loren Shih bf7201cf8b dummy commit test 2010-09-09 17:06:37 -04:00
Loren Shih f981e5af3f dummy commit test 2010-09-08 17:15:58 -04:00
Loren Shih 4a8d59367a dummy commit test 2010-09-08 16:27:42 -04:00
Loren Shih 074f4c8c59 VWR-22901 FIXED Backwards compatibility for multiattachments
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-08 13:36:42 -04:00
Loren Shih 592ebc9ec6 VWR-22695 FIXED Adding attachments messaging is inefficient
Superficial code cleanup of RezAttachment messaging.
2010-09-02 15:34:54 -04:00
Loren Shih 0440fe4dcc VWR-22695 FIXED Adding attachments messaging is inefficient
Single attachment request are now batched up and sent all at once as a single message.
2010-09-01 12:02:48 -04:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Tofu Linden b5a8534116 (final?) hairy merge from viewer-release to viewer-public 2010-08-17 11:41:12 -07:00
Vadim Savchuk 6c8494295a Merge from default branch
--HG--
branch : product-engine
2010-08-16 15:35:40 +03:00
Brad Payne (Vir Linden) d77c3e3600 merge 2010-08-13 14:39:04 -04:00
Brad Payne (Vir Linden) 37a0124bfd DEV-52580 FIX 2010-08-13 14:33:30 -04:00
Vadim Savchuk 482d3abc3c EXT-8662 FIXED Crash on renaming incomplete inventory items.
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-13 18:13:37 +03:00
Loren Shih 5881252ab2 EXT-8650 Can wear multiple copies of no-copy item via object links
* 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-13 11:12:51 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Sergei Litovchuk dd692f17ab EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().
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-12 15:56:51 +03:00
Vadim Savchuk 2f2a0ad38a EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().
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-09 21:14:07 +03:00
Vadim Savchuk 62466c0704 EXT-8577 WIP Context menu items for multi-attachments.
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-08-06 17:14:01 +03:00
Loren Shih 34ab18d0c2 EXT-8918 FIXED Incorrect right-click options for library items
Library items have "Share" disabled.
2010-07-26 18:14:32 -04:00
Loren Shih 4a361046f3 EXT-8229 FIXED Add "--no options--" automatically instead of special casing 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-26 17:53:48 -04:00
Loren Shih 2961992a7e EXT-8448 FIXED [crashhunters] Crash in LLFolderBridge::folderOptionsMenu(), 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-20 12:50:13 -04:00
Richard Linden 39ae8785b4 EXT-8448 FIX [crashhunters] Crash in LLFolderBridge::folderOptionsMenu()
reviewed by Callum
2010-07-19 15:15:04 -07:00
Vadim Savchuk faf262e2a9 EXT-8373 FIXED Fixed translation of attachment points in "Attach..." / "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-15 18:22:34 +03:00
Loren Shih d8f795aa9c automated merge 2010-07-09 10:19:15 -04:00
Loren Shih 074157c1fe EXT-8292 FIXED Folder wear options disabled in expanded menu on first 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-08 17:46:36 -04:00
Loren Shih b67009415d EXT-8269 FIXED "Copy and Wear" from in-world object doesn't wear bodyparts
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-08 15:02:45 -04:00
Mike Antipov 479731f6a0 EXT-8243 FIXED Replaced method to create link in COF with top-level 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-08 19:12:45 +03:00
Loren Shih 5ea8653b3d EXT-8252 FIXED Folders can be dragged into Outfits
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-06 17:08:05 -04:00
Loren Shih 419bfb16fd automated merge 2010-07-06 15:49:32 -04:00
Loren Shih ced040f8ae EXT-8244 FIXED Not wearable links could be added to COF by drag-n-drop in 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-06 15:47:17 -04:00
Nyx (Neal Orman) e78f96b2fb EXT-8213 FIX users cannot replace their shape if it does not load
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-02 15:55:49 -04:00
Loren Shih cd4c44fe7a EXT-8198 Incorrect right-click options for library folders
Only adding "--no options--" when right-click context menu is empty.  Normal priority bug but rather annoying visually.
2010-07-02 14:56:12 -04:00
Loren Shih 05bc1be479 EXT-8197 FIXED Can't select mixed group of wearables and objects for "Wear" 2010-07-01 17:44:52 -04:00
Loren Shih 3ce3df5643 EXT-8033 FIXED Selecting multiple inventory items can give incorrect 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-28 12:25:33 -04:00
Loren Shih 1a2a25cb85 EXT-7747 FIXED Turn on multiattachments for 2.1 as debug setting
This #ifdef is now keyed to MultipleAttachments debug setting
2010-06-24 17:38:12 -04:00
Sergei Litovchuk 887b2858d4 EXT-7779 FIXED Changed wearing panel from inventory panel to a flat list 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-11 20:02:42 +03:00
Vadim Savchuk a8276dfd59 Merge from default branch
--HG--
branch : product-engine
2010-06-18 14:08:46 +03:00
Monroe Linden b022a9f158 Fix for EXT-6277 ("Edit" right-click inventory item does nothing if item is not worn).
Reviewed by Leyla.
2010-06-17 15:59:42 -07:00
Vadim Savchuk 9f99644360 EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items 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-17 19:03:57 +03:00
gabriel lee 42a4ab9ae1 EXT-7834 fixed corruption of menu item vectors
reviewed by Richard
2010-06-16 18:03:03 +01:00
Loren Shih f12aa928c5 EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15 15:56:54 -04:00
Loren Shih a37f7ec200 automated merge 2010-06-10 11:41:59 -04:00
Loren Shih 388318c532 EXT-7430 : Create art overlay for inventory icons that are links
Changed folder icon logic to use LLViewerFolderType (as it should always been doing).
2010-06-10 11:41:28 -04:00
Loren Shih e414a91d7f EXT-7430 : Create art overlay for inventory icons that are links
Took out explicit _Link icons and replaced with overlay.
Removed links overlays from non-main-inventory-floater panels.
2010-06-09 17:09:42 -04:00
Vadim Savchuk 48ccb5755e EXT-6726 ADDITIONAL FIX Minor code cleanup.
Removed duplicated code from LLFolderBridge::isItemRenameable().

Requested by Richard at https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-09 18:19:23 +03:00
Nyx (Neal Orman) c26eeb6f7a Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 11:10:15 -04:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
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-03 20:06:25 -04:00
Paul Guslisty 5dc2fcf8e2 EXT-7429 FIXED Removed itallicise \"worn\" objects in inventory panels
- 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-03 20:46:56 +03:00
Vadim Savchuk 671625695f EXT-6726 WIP Added more menus to the Appearance SP.
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-02 20:46:16 +03:00