Commit Graph

172 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih 65dfc74688 Minor comment change. 2009-12-21 17:46:46 -05:00
Loren Shih c26034531a EXT-3582 : My Outfits populates from library if I delete my last outfit
Autopopulation logic is now smarter and only triggers if this is the first time you're logging into viewer2.0.
2009-12-21 16:49:14 -05:00
Loren Shih 37b04c1507 EXT-3582 : My Outfits populates from library if I delete my last outfit
Tracking a "Is this my first time in viewer2.0?" flag and only populating My Outfits folder if it's true.
2009-12-21 14:54:55 -05:00
Loren Shih e0f5ce4ecf EXT-3582 : My Outfits populates from library if I delete my last outfit
Now checking if this is the first time a user has logged into viewer2.0, via checking against COF existence.

This doesn't quite work yet because something before LLAgentWearables is also looking up COF.
2009-12-18 15:18:40 -05:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Loren Shih d629be01cb Automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-02 12:16:24 -05:00
Loren Shih 8fdd2e0b28 EXT-3028 : "Find Original" does nothing if floater inventory isn't open
Changed logic for getActiveInventory so that it considers InventorySP.
Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage.
This currently contains a bug because the InventorySP always thinks it's open.

--HG--
branch : avatar-pipeline
2009-12-01 21:12:34 -05:00
Nyx (Neal Orman) 5642d7d012 EXT-2749 Appearance editor still uses the name for items that have been renamed.
The name stored in an LLWearable object is not always in sync with the
LLInventoryItem name. Since we reference these by asset id, which does not
change when you rename something (only the LLInventoryItem changes).

Fixed by refreshing the name from the LLInventoryItem every time we wear the
object. If we are already wearing the object, the wearable's name is already
explicitly updated.

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-01 19:21:39 -05:00
Loren Shih 27351b8bf5 automated merge for viewer-2.0 -> avp.
--HG--
branch : avatar-pipeline
2009-12-01 12:52:21 -05:00
Nyx (Neal Orman) 4c90bcd574 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-30 15:22:12 -05:00
Brad Payne (Vir Linden) 4899fea006 For EXT-2857: Open 'Outfits Bar' accordion when creating/renaming new outfit
--HG--
branch : avatar-pipeline
2009-11-30 11:58:28 -05:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
Nyx (Neal Orman) 43d52671c8 EXT-2769 hair alpha not applied immediately
Apparently none of the texture pickers were invalidating the baked textures
causing selected textures to not appear on the avatar until you actually saved
the wearable. This patch forces the composites to update when you change any
texture or color (or invisibility flag).

Code reviewed by Seraph

--HG--
branch : avatar-pipeline
2009-11-25 13:59:23 -05:00
Brad Payne (Vir Linden) c60165a93c For EXT-2584: Select and rename new folder when creating new outfit
--HG--
branch : avatar-pipeline
2009-11-25 13:39:45 -05:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 0e351bedb6 Removed llnotifications.h from all headers by adding llnotificationsptr.h
Fixed many more includes
2009-11-24 22:55:56 -08:00
Nyx (Neal Orman) 4821134aa7 EXT-2671 avatar rebaking on every login
We were querying agent wearables (baked texture) cache before setting
mWearablesLoaded. First thing the function does is checks mWearablesLoaded.
Moving the call down to later in the function allows us to request & use
cached baked textures again.

Code reviewed by Seraph

--HG--
branch : avatar-pipeline
2009-11-24 15:34:31 -05:00
Nyx (Neal Orman) ef63c80766 EXT-2535 wearables created in 2.0 don't load in 1.23
Re-opening issue for a second pass at it. This pass updates the code that was
intended to make all loaded wearables auto-save themselves back to wearable
version 22 (from 24). Code was not being hit, so relocated it to after wearable
had been added to llagentwearables to ensure the save succeeded.

Will be post-reviewed before push.

--HG--
branch : avatar-pipeline
2009-11-23 11:46:15 -05:00
Brad Payne (Vir Linden) 3263a6cbad merge
--HG--
branch : avatar-pipeline
2009-11-20 10:01:06 -05:00
Brad Payne (Vir Linden) fae7834991 cleanup: log file spam
--HG--
branch : avatar-pipeline
2009-11-19 17:36:13 -05:00
Brad Payne (Vir Linden) 62ce5fa462 For EXT-2623 - object missing wearables and attachments on initial login
--HG--
branch : avatar-pipeline
2009-11-19 16:00:40 -05:00
Brad Payne (Vir Linden) 0c95f8bf30 For EXT-2623 - object missing wearables and attachments on initial login
--HG--
branch : avatar-pipeline
2009-11-19 12:03:11 -05:00
Loren Shih 5dea0791f7 EXT-2581 : Old items still display as "(worn)" even after I change outfits
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
Eric M. Tulla (BigPapi) 3217887356 Merge of viewer2 into avp
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
Brad Payne (Vir Linden) 9c823a1d40 Deferring work to idle time to avoid recursive notifyObservers calls - added wrapper class to defer an arbitrary boost::bind or other callable
--HG--
branch : avatar-pipeline
2009-11-17 10:33:47 -05:00
Steve Bennetts f17399212e Compile fix for Windows 2009-11-14 11:09:07 -08:00
Eric M. Tulla (BigPapi) 68c6ff791f Fix for post-merge compile error. 2009-11-13 22:22:30 -05:00
Eric M. Tulla (BigPapi) cd9c5e5d70 merging avatar-pipeline branch into viewer-2-0 2009-11-13 20:34:55 -05:00
Loren Shih acdce23299 Header file cleanup
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
Loren Shih 3b730cef75 merge
--HG--
branch : avatar-pipeline
2009-11-13 11:10:29 -05:00
Loren Shih b685895dd0 EXT-2426 : Remove COF processing that is causing recursive calls to gInventory.notifyObservers
Changing COF processing to happen during idle(), versus within done().

Reviewed by: Vir

--HG--
branch : avatar-pipeline
2009-11-12 18:11:25 -05:00
Brad Payne (Vir Linden) 0b104e2a41 LLAppearanceManager cleanup - turning into proper singleton
--HG--
branch : avatar-pipeline
2009-11-12 15:10:06 -05:00
Eric M. Tulla (BigPapi) 4272ecaabe Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 11:54:14 -05:00
Brad Payne (Vir Linden) de6ca4c5ea Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 11:20:57 -05:00
Loren Shih 9b1680927f merge 2009-11-11 20:41:24 -05:00
Eric M. Tulla (BigPapi) 7e74e18548 Fix for EXT-2244 - Auto fill the My Outfits folder from library/clothing if empty
-Reviewed by Seraph
2009-11-11 20:27:29 -05:00
Brad Payne (Vir Linden) 9245322706 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 18:57:12 -05:00
Brad Payne (Vir Linden) 4f3d32f5c7 Believe this fixes the remaining issues with missing attachment links on first use of 2.0 - EXT-1593 and EXT-1591. 2009-11-11 18:23:54 -05:00
Nyx (Neal Orman) f6406b7174 EXT-2173 use of visual param animation inconsistent at best
removed ambiguous parameter "set_by_user" from many places in codebase,
renaming it to be upload_bake, which is a more accurate descriptor.
This allowed me to see several inconsistencies in how this variable was
being set - these errors were also fixed. User-visible result should be
that baked textures are not reuploaded on changing avatar sex until the
save button is pressed. primary win here is code clarity.

Code reviewed by Bigpapi.
2009-11-11 16:37:59 -05:00
Loren Shih ae9c4e3ae9 Minor comment cleanup for llagentwearables.cpp. 2009-11-10 17:41:54 -05:00
Brad Payne (Vir Linden) 6f6d1314e6 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-05 08:33:31 -05:00
Brad Payne (Vir Linden) 5c2d187d6f Small cleanup in LLAgentWearables.cpp 2009-11-04 18:58:27 -05:00
Brad Payne (Vir Linden) dc365be4d2 For EXT-1985: Clothing previously taken off is re-worn when creating a new clothing item in appearance mode.
General problem with failing to update the COF when clothing items were removed.  Added hook in removeWearableFinal, which should guarantee that we're always removing clothing links when we need to.
2009-11-04 18:03:04 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Brad Payne (Vir Linden) 8f6b28d89f Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
--HG--
branch : avatar-pipeline
2009-11-03 12:53:40 -05:00
Brad Payne (Vir Linden) 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
Loren Shih 310a7b60f7 Merge conflict resolution for previous commit.
--HG--
branch : avatar-pipeline
2009-11-02 16:22:18 -05:00
Loren Shih bde7d67066 EXT-1866 : Inventory Side Panel
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel

Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
James Cook f553f7fd15 Fix signed/unsigned mismatch breaking the build. 2009-10-29 16:07:00 -07:00
Nyx (Neal Orman) 8bf1dd2f1b previous checkin had a signed/unsigned mismatch. Using a cast to fix it. 2009-10-29 17:42:32 -04:00
nyx@NyxTop 65f5348997 EXT-1945 visual parameter animations broken
First round of fixes for trying to fix the visual param animations

Code reviewed by Seraph
2009-10-29 15:13:27 -04:00
Neal Orman 576b8fe6ec EXT-1809 Wearing an item doesn't update avatar
Two part fix: prevented the copying of wearable parameters to the avatar to trigger a rebake.
Then: Called wearableUpdated every time a wearable was added/removed/replaced and ensured it properly invalidated the composite

Confirmed working fix on developer machine.

Code reviewed by Seraph.
2009-10-23 22:19:15 +00:00
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