Commit Graph

388 Commits (c67d2d6eea930a1db07d5de7d4e961fe8d99e87a)

Author SHA1 Message Date
Arrehn 023d72ccc0 Worn items tab, thanks Satomi Ahn 2010-11-23 23:19:49 -05:00
Arrehn b96b8e3ca0 Merge with RLva-#head 2010-11-04 10:09:29 -07:00
Arrehn d0d3e716dc Rolling back before back RLV merge 2010-11-04 10:02:01 -07:00
Arrehn cc718fcdf2 Snowstorm syncup 2010-11-03 22:44:26 -07:00
Merov Linden accbddaead STORM-283 : merge with viewer-development 2010-11-02 17:31:01 -07:00
Seth ProductEngine f4a99d359c STORM-287 FIXED changing currnet outfit with an outfit dragged from Library to My Inventory->Current Outfit folder. 2010-11-01 23:52:09 +02:00
Seth ProductEngine cace89d2e9 STORM-283 FIXED adding attachments of type LLInventoryType::IT_ATTACHMENT to Current Outfit. 2010-11-01 23:50:31 +02:00
Arrehn 8fcb69d0c3 Integration of RLVa, pre-display names.
HUDtext updates may be broken, much testing needed.
I expect this merge to be improved and even fully replaced by up and coming RLVa work.
When we do get a clean merge of RLVa, it should stay clean.
It does compile ;)
2010-10-31 20:47:18 -04:00
Kitty Barnett 9498c31d3c Merged with default tip (Revision aeb7e6c38341)
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
Kitty Barnett d21d1aa76f Merged with Viewer-Build tip
--HG--
branch : .RLVa
2010-10-31 23:32:53 +01:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86)
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
Kitty Barnett 212792f797 Merged with Viewer-Build tip
--HG--
branch : .RLVa
2010-10-30 01:41:33 +02:00
Seth ProductEngine 9c8ce6d6dc STORM-296 FIXED Item types that can be dropped to Favorites and Landmarks 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-10-27 19:01:38 +03:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07: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 6c32648b10 [Appearance/Misc]
- review : reviewed remaining changes for SL-2.2.0 and updated patch description

--HG--
branch : Appearance-Misc
2010-09-22 15:52:26 +02:00
Kitty Barnett 0d7b11fd12 Merged with branch point for SL-2.2.0 (Revision dc8ac597008a)
--HG--
branch : Appearance-Misc
2010-09-22 03:47:20 +02: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
Leyla Farazha 60db8577a9 Merge 2010-09-16 12:02:24 -07: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 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
Kitty Barnett 600d60e498 Merged with default tip (Revision c752f2cb29e1)
--HG--
branch : RLVa
2010-09-07 01:28:38 +02:00
Kitty Barnett 105ac73464 [Appearance/Misc]
- fixed : LLWearableBridge::removeAllClothesFromAvatar() doesn't remove all clothing from the avatar

--HG--
branch : Appearance-Misc
2010-09-04 04:07:10 +02:00
Kitty Barnett b6b0a45b19 - fixed : "Wear" on the inventory item context menu isn't visually disabled for wearables or attachments
- fixed  : "Add" on the inventory item context menu isn't visually disabled for attachments
- review : canAttach/canWear/canDetach/canRemove

--HG--
branch : RLVa
2010-09-04 00:45:34 +02:00
Kitty Barnett 48801314f5 - fixed : crash in LLAppearanceMgr::updateAppearanceFromCOF() due to "Appearance-SyncAttach" patch
-> fixed in "Appearance-Misc", local fix will dissapear on the next pmerge
- fixed : LLWearableBridge::removeAllClothesFromAvatar() doesn't remove all clothing from the avatar
    -> fixed in "Appearance-Misc", local fix will dissapear on the next pmerge

--HG--
branch : RLVa
2010-09-04 03:54:37 +02:00
Kitty Barnett e98e3d4efa - internal : moved "canDetach" checks from callers to LLVOAvatarSelf::detachAttachmentIntoInventory() instead
- internal : changed @detachme=force to use LLVOAvatarSelf::detachAttachmentIntoInventory()
- internal : fix-up for LLAppearanceMgr::removeItemFromAvatar() due to merging in Appearance-Misc patch branch

--HG--
branch : RLVa
2010-09-04 03:03:34 +02:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Kitty Barnett f8a875db34 merge of .RLVa
--HG--
branch : RLVa
2010-09-02 22:18:51 +02: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
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
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
Kitty Barnett a25aedbccd - internal : cleanup of rez_attachment() and callers
- internal : RlvAttachmentLocks::canAttach() doesn't need to take the "MultipleAttachments" setting into account

--HG--
branch : RLVa
2010-08-25 18:52:03 +02: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
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i
--HG--
branch : RLVa
2010-08-22 10:57:22 +02: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