Commit Graph

219 Commits (8485bff29b98f47954b78b31b2e0511f94de3be4)

Author SHA1 Message Date
Kitty Barnett 4cff1ac962 Merged with RLVa-1.3.1b tip 2011-06-07 16:03:57 +02:00
Kitty Barnett 892fa59440 - internal : commented out unused LLAgentWearables code to make sure it doesn't accidentally get used
--HG--
branch : RLVa
2011-06-07 11:14:50 +02:00
Kitty Barnett 825d5bc58e Merged with RLVa-1.3.1c 2011-06-03 21:38:34 +02:00
Kitty Barnett e248153477 Merged with RLVa-1.3.1a tip
--HG--
branch : RLVa
2011-05-27 15:54:30 +02:00
Kitty Barnett c80812fb9f - internal : header dependency cleanup for rlvcommon.h and rlvhandler.h
--HG--
branch : RLVa
2011-05-22 11:34:34 +02:00
Kitty Barnett 1404e6ea34 - fixed : multi-attachments sometimes don't reattach on the next login when @addattach=n restricted
-> attachments actually would attach but instantly be detached by the RlvAttachmentLockWatchdog instance

--HG--
branch : RLVa
2011-05-22 03:14:14 +02:00
Kadah 472fcabcb3 Merge avatar-physics to Firestorm 2.5.2 2011-04-14 16:33:21 -07:00
Kitty Barnett 363659fc22 - added : wearable and attachments related @notify notifications
--HG--
branch : RLVa
2011-04-01 02:45:06 +02:00
Kitty Barnett 604345b918 Merged with .RLVa tip
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
Kitty Barnett 6d17e86138 - internal : reviewed for SL-2.5.0
--HG--
branch : Appearance-Misc
2011-01-13 01:52:15 +01:00
Oz Linden efa42a6aab merge up to viewer-development 2010-12-04 09:14:58 -05:00
Kitty Barnett c434dcafb2 Merged with branch point for SL-2.2.0 (Revision dc8ac597008a)
--HG--
branch : RLVa
2010-09-22 21:01:32 +02:00
Kitty Barnett 723e874e38 [Appearance/Misc]
- fixed : rewrote fix for http://jira.secondlife.com/browse/VWR-18512

--HG--
branch : Appearance-Misc
2010-09-22 08:06:03 +02:00
Kitty Barnett aa6fda8113 [Appearance/Misc]
- fixed : LLAgentWearables::mInitialWearablesLoaded doesn't accurately reflect whether the initial wearables have actually loaded
    -> if LL ever gets rid of all the legacy (mostly dead) code in llagentwearables.* we can just use mWearablesLoaded

--HG--
branch : Appearance-Misc
2010-09-22 04:43:36 +02:00
Kitty Barnett f7ff27e313 Merged with default tip (Revision b8cd74d2bcc8)
--HG--
branch : RLVa
2010-09-15 23:22:10 +02:00
Kitty Barnett bd19da5acf Merged with Viewer-Build tip
--HG--
branch : .RLVa
2010-09-15 20:35:27 +02:00
Kitty Barnett 410541f04e Merged with default tip (Revision b8cd74d2bcc8)
--HG--
branch : Appearance-Misc
2010-09-15 20:25:33 +02:00
Loren Shih eed7b72011 automated merge 2010-09-08 17:58:17 -04:00
Loren Shih 16031c354f automated merge from viewer-development 2010-09-07 10:23:19 -04:00
Kitty Barnett 600d60e498 Merged with default tip (Revision c752f2cb29e1)
--HG--
branch : RLVa
2010-09-07 01:28:38 +02:00
Kitty Barnett a02d3cef68 Merged with Viewer-Build tip
--HG--
branch : .RLVa
2010-09-06 22:20:08 +02:00
Kitty Barnett bd6cdc22aa Merged with default tip (Revision c752f2cb29e1)
--HG--
branch : Appearance-Misc
2010-09-06 22:11:13 +02:00
Boroondas Gupte 5ead04fb46 VWR-22113 FOLLOWUP fixed indentation
... and changed jira issue ID in comment to the current one
2010-09-04 21:54:46 +02:00
Tofu Linden a04da8fe75 integrate patch from VWR-22113 'crash hunters - crash, possibly on exit when disconnected' 2010-09-04 19:00:49 +01:00
Kitty Barnett f8a875db34 merge of .RLVa
--HG--
branch : RLVa
2010-09-02 22:18:51 +02:00
Loren Shih 88831427bf VWR-22692 FIXED Multiattachments don't save correctly in outfits
Fixed login issue that was causing multiattachments to be replaced instead of added.
2010-08-31 19:51:59 -04:00
Loren Shih c859923cf6 Physics no longer perform for avatars that are smaller than some certain screenspace metric.
Physics no longer removed when outfits changed.
2010-08-31 14:42:09 -04:00
Kitty Barnett 70851bd90c - fixed : "Add to Outfit" / "Replace Outfit" results in a "WARNING: LLControlGroup::get: Control MultipleAttachments not found"
-> LLAgentWearables::userAttachMultipleAttachments() still had a reference to the now deprecated "MultipleAttachments" debug setting

--HG--
branch : RLVa
2010-08-30 04:26:38 +02:00
Kitty Barnett baa6794d0c [Appearance/Misc]
- fixed : LLAppearanceMgr::filterWearableItems() doesn't properly filter body parts
- fixed : LLWearableList::processGetAssetReply() creates multiple LLWearable instances for the same asset UUID
    -> fix for http://jira.secondlife.com/browse/VWR-20608
- changed : deprecated removeItemFromAvatar() in favour of having LLAppearanceMgr::removeItemFromAvatar() handle it directly/correctly
    -> wearables can't be worn/removed in 2.X without the viewer already having an LLWearable instance for it anyway
- added : InitialWearablesLoadedSignal signal which is emitted *once* when the initial wearables are loaded
- fixed : attachments sometimes detach only to instantly get reattached after logon
- added : LegacyMultiAttachmentSupport debug setting to route "secondary attachment points" to the primary attachment point
    -> maps secondary attachment point range [39,68] onto [1,30]
    -> only dislays "secondary attachment points" correctly for *other* avatars (by design)

--HG--
branch : Appearance-Misc
2010-08-28 20:40:14 +02:00
Kitty Barnett e6e551cb41 Merged with default tip (Revision 7a739cbdce56)
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
Loren Shih 5e11016970 Fixed an issue where you go into appearance pose when editing physics if you were formerly in edit outfit.
Miscellaneous code cleanup.
2010-08-25 17:51:01 -04:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Loren Shih 981a43b355 Created new wearable type.
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Loren Shih 7836f0fff3 EXT-8650 Can wear mutliple copies of a no-copy item via object links
- 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-11 12:34:27 -04: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
Andrew Dyukov d20e7471ad EXT-8539 FIXED Fixed title of alpha mask not save if renaming it from 'Editing' panel.
Bug happened because name change was not explicitly  listed as sufficient reason to save a wearable. So saving failed for alpha masks with only names changed.
Other wearables didn't have this problem because they passed precondition even if only name was changed thanking to checks that included visualparams.

- Made name change explicitly a sufficient reason to proceed with saving a wearable.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/840/

--HG--
branch : product-engine
2010-08-06 16:00:03 +03:00
Brad Payne (Vir Linden) d5655c9bbf EXT-8283 FIX - allow saveWearable to change name of wearable, split off logic for saveAs case. Some remaining UI issues will be filed separately. Reviewed by Nyx 2010-07-15 13:56:46 -04:00
Tofu Linden a1bbba2be6 CID-485
Checker: NULL_RETURNS
Function: LLAgentWearables::setWearableName(const LLUUID &, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llagentwearables.cpp
2010-07-06 11:23:22 +01:00
Tofu Linden e04df15bf1 CID-484
Checker: NULL_RETURNS
Function: LLAgentWearables::animateAllWearableParams(float, int)
File: /indra/newview/llagentwearables.cpp
2010-07-06 11:21:45 +01:00
Tofu Linden 99e7e72507 CID-486
Checker: NULL_RETURNS
Function: LLAgentWearables::revertWearable(LLWearableType::EType, unsigned int)
File: /indra/newview/llagentwearables.cpp
2010-07-06 11:20:05 +01: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
Loren Shih 1d683a65a2 EXT-7818 FIXED Click on Take Off on my shoes fro inventory doesn't remove shoe
Added additional logic to tell if you're in edit outfit mode, removed some bad code that was causing removed wearables to never send out an appearance update.
2010-06-24 14:45:36 -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
Mike Antipov b12c98e48c EXT-7777 Just added more descriptive comment.
--HG--
branch : product-engine
2010-06-21 12:49:04 +03:00
Mike Antipov 89825da530 EXT-7777 WIP Implemented loading indicator for "Save" and "Save As" actions in "My Outfits" & "Edit Outfit" Panels.
EXT-7929 FIXED Updated functionality of attaching object: loading indicator gets hidden when attaching is completed.

- Fixed crash when accessing singleton on application exit.

- Updated functionality of attaching object: loading indicator was not hidden.
 * Reason: link to attachment was created without next appearance updating.
 * Fix: passed "true" into LLAppearanceMgr::addCOFItemLink to call LLAppearanceMgr::updateAppearanceFromCOF when attachments is completed. (Like for clothing).

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/611/

--HG--
branch : product-engine
2010-06-18 17:28:32 +03:00