Commit Graph

20 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author SHA1 Message Date
Loren Shih 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
Neal Orman 4e6fd496ee EXT-1822 changing textures in appearance not immediate
Texture changes in appearance editor were not taking effect immediately. Changed texture setting code to refresh local bake of textures.

Code reviewed by Vir
2009-10-22 22:25:38 +00:00
Neal Orman e5484e56b3 EXT-1784 Server getting spammed whenever you put on a wearable
Made an adjustment to ignore remove requests on items that don't exist, to avoid the extra messages to the server.
Also made a couple of adjustments to ensure removal of alpha masks and tattoos along with other wearable types.
Added these code points to the wiki page detailing what modifications need to be made when adding a new wearable type:
https://wiki.lindenlab.com/wiki/User:Vir#Adding_new_wearables

Code reviewed by Seraph.
2009-10-22 18:29:52 +00:00
Loren Shih 5164ed388c Code audit for r136515 ("merging in new wearable infrastructure...")
No expected functionality change; this mostly contains cosmetic cleanup.

Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
Neal Orman 404ed736ec Remove "add" inventory operation and rename MAX_WEARABLES_PER_TYPE
This patch removes the invalid "add" operation shown on wearables in inventory
It also renames MAX_WEARABLES_PER_TYPE, resets the value to 1 (non-multi-wearables), and adds a weak check to enforce one wearable per type.

Code reviewed by Vir
2009-10-19 21:02:33 +00:00
Loren Shih 89d92267e2 svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments

This is a viewer-side-only, infrastructure-only merge for multi-attachments.  This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.

Reviewed by: Vir.
2009-10-16 21:41:31 +00:00
Neal Orman d08b0b6ae8 merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .

Progress can be tracked in DEV-32551.

 -Nyx
2009-10-16 17:56:30 +00:00
Bradley Payne 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
Eric Tulla 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
Bradley Payne 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
Loren Shih 8244288323 For DEV-39666 : Ensure AgentWearables saves actual items, not links, to database
For backwards compatibility, this change ensures that links aren't saved to user_wearable.

Reviewed by: Vir.
2009-09-11 15:06:18 +00:00
Bradley Payne 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
Bradley Payne 50f732bc01 For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled. 2009-08-18 20:18:40 +00:00
Loren Shih ac1b723fd7 svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
2009-08-18 15:34:09 +00:00
Loren Shih f83601c180 For DEV-37866 : Crash when creating a new look b/c of non-existent attachments
Simple fix -- added NULL check to logic that processes attachments.
2009-08-12 19:53:45 +00:00
Loren Shih 7bbc5cdea6 svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification

This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-08-12 19:03:20 +00:00
Neal Orman 56e0455479 QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.


 -Nyx
2009-07-14 15:14:46 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
Loren Shih a00af78b95 merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-06-24 21:36:42 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00