6f6d1314e6
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-05 08:33:31 -05:00
fa3b57bd9f
Merge the work lost in 49c9461937df back into the tree
2009-11-04 15:14:54 -08:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
98a24938b3
LLAppearanceManager::wearItem() - always check for extra links of same type, even if requested object is already linked.
2009-11-04 15:28:07 -05:00
ec8e27b8bf
Remove existing wearables of a type when putting on new ones. This will need to be revisited when we go to multi-wearables.
2009-11-04 13:14:57 -05:00
9109809fb1
For EXT-1591: Current Outfit Folder contains duplicate attachment items after relog.
...
--HG--
branch : avatar-pipeline
2009-11-03 12:22:31 -05:00
86b1ee7703
Work in progress on attachment tracking.
2009-11-02 14:10:56 -05:00
cc1c8bb9bc
EXT-1804: Operations on the current look do not enforce one wearable per type
...
DEV-39346: OUTFITS (Operations) : Restrict one shape per look, and some # of multiwearables per look
DEV-38436: OUTFITS : Guarantee every outfit has fully populated links to (one each of) all body parts.
Consolidated all paths for replacing or appending to COF, with common enforcement mechanism for counts of body parts, clothing, etc.
Several functions are no longer needed after these changes, will clean up in a later pass.
2009-10-29 11:19:45 -04:00
584962d5c7
svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-23 15:21:49 +00:00
67c4555a37
svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
* Bugs: EXT-1779
2009-10-21 23:08:48 +00:00
850c0f1e33
Merge of latest avatar pipeline working branch into viewer2.0 branch.
...
Result of: (NO CONFLICTS)
svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
2009-10-16 20:11:51 +00:00
3bd6c1919c
Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.
...
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-10-12 18:40:11 +00:00
6d887be589
Syncing latest appearance work from avatar pipeline into viewer2.0.
...
Result of: (NO CONFLICTS)
svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .
2009-09-29 23:09:41 +00:00
af774fc9db
For EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder and EXT-1090: Attachments detach on login.
...
This is still in short term fix territory - trying to avoid creating duplicate attachment links when wearing outfits. It's not 100% robust because of the possibility of race conditions.
2009-09-25 15:18:34 +00:00
7eca974a11
Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details.
2009-09-24 18:05:38 +00:00
73d152093d
For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
...
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10 18:42:19 +00:00
Brad Payne (Vir Linden)