Commit Graph

166 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Mike Antipov 32283ca339 EXT-7777 FIXED reverted changes to show loading indicator for "Wear/Attach" action.
Because it was too hard to fix EXT-7949 having so extremly lack of time.
Proper fix for EXT-7949 requires changes in different places of the code calling add/removeCOFItemLink().

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

--HG--
branch : product-engine
2010-06-24 11:53:26 +03: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 08381a276d EXT-7755 ADDITIONAL FIX Fixed issues with wrong title after an outfit from the Inventory is worn, "Wear..." menu items state is made consistent with "Wear" button.
* Empty string is replaced with "Changing outfits" while changing COF;
* Fixed title to show "No Outfit" after an outfit from the Inventory is worn;
* Fixed bug with visible indicator after an empty folder is DnD from the Inventory "Clothing"
* Updated context and Gear "Wear..." menu items to take into account "isCOFChangeInProgress" state in on_enable callbacks

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

--HG--
branch : product-engine
2010-06-23 15:30:48 +03:00
Brad Payne (Vir Linden) 4eab82d5e2 merge 2010-06-21 15:54:02 -04:00
Brad Payne (Vir Linden) 8aef04f33c EXT-4919 WIP - fixed problems with inventory fetch failing to time out, added copying/activation of more gesture folders 2010-06-21 11:56:59 -04: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
Vadim Savchuk 9f99644360 EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items to be enabled when appropriate and work properly.
Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options:
- The menu items of the outfit context menu and the My Outfits gear menu are now disabled
  when inappropriate instead of being hidden.
- The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit.
  (was: depending on whether you're wearing the outfit)
- Changed the way the options work: they now only operate on clothes and attachments.
  "Add to COF" now only adds those body parts that are missing in COF;
  "Remove from COF" doesn't touch body parts at all.

  Without this change both "Add" and "Remove" options would be available simultaneously, because
  any valid outfit contains body parts. I think that would be confusing.
  And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement)

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/

--HG--
branch : product-engine
2010-06-17 19:03:57 +03:00
Mike Antipov 9745a0a9e4 EXT-7777 WIP Added several cases to show Loading indicator in "My Outfits:"
* Outfit is loading for the first time
* After user clicks:
 ** Item Context menu > Add
 ** Item Context menu > Replace

Known Issues:
1. For multi-wearable indicator will disappear after first item from the batch is worn.
   Did not fix this to not affect the stability before 2.1 release.
2. To show loading indicator first time we have to notify subscribers of LLAgentWearables.
   For now this is done from the deprecated LLAgentWearables::processAgentInitialWearablesUpdate

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

--HG--
branch : product-engine
2010-06-17 17:03:05 +03:00
Brad Payne (Vir Linden) cc5beffdf4 merge 2010-06-16 15:29:41 -04:00
Brad Payne (Vir Linden) bc91053543 EXT-6571 FIX - avoid removing links to missing wearables, which fixes a problem with ordering in multi-wearables 2010-06-16 15:26:53 -04:00
Loren Shih 4ae0a0703b EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a couple more llinfos spam to not show up in release mode.
2010-06-15 17:58:08 -04:00
Loren Shih 0be5ce0a59 EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a bunch of llinfos spam to not show up in release mode.  Removed some other legacy comments.
2010-06-15 17:11:01 -04:00
Brad Payne (Vir Linden) 9b014886b0 merge 2010-06-15 14:36:32 -04:00
Brad Payne (Vir Linden) 44f65edd68 merge 2010-06-15 12:53:56 -04:00
Mike Antipov 300cb34291 EXT-7794 FIXED Implemented a common-used notification about wearing outfit to display loading indicator.
Details:
* Added signal "Wearable Loading Started" in AgentWearables (in parallel with "Wearables Loaded")
* Now it is raised from the LLAppearanceMgr::wearInventoryCategory.

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/583/

--HG--
branch : product-engine
2010-06-15 12:38:30 +03:00
Brad Payne (Vir Linden) 961656863a EXT-6571 WIP - fixes for handling of late arriving assets 2010-06-14 17:19:40 -04:00
Brad Payne (Vir Linden) 8364708595 EXT-6571 WIP - basic handling of late arriving assets 2010-06-14 13:15:58 -04:00
Alexei Arabadji 0ec92fb1c8 EXT-7783 FIXED Provided updating outfit label in My outfits and Edit outfit panels.
1 Corrected LLAppearanceMgr::getBaseOutfitLink() method to avoid returning link in case base outfit moved to trash.
2 Hooked up LLSidepanelAppearance::refreshCurrentOutfitName() method on BOFReplaced signal.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/571/

--HG--
branch : product-engine
2010-06-14 16:12:20 +03:00
Yuri Chebotarev 664a07dd8d EXT-7727 FIX reset sidetray tab to home_tab when login is complete.
Aslo add parameter to callback to prevent showing appearance panel when creating initial outfit  - _sometimes_ this callback was called _after_ login was finished.

rewieved by Mike Antipov at https://codereview.productengine.com/secondlife/r/574/

--HG--
branch : product-engine
2010-06-14 14:59:56 +03:00
Brad Payne (Vir Linden) 5777824df4 EXT-6571 WIP - partial handling of late arriving assets 2010-06-11 18:08:59 -04:00
Brad Payne (Vir Linden) 8a5c71ea1d merge 2010-06-11 10:09:02 -04:00
Brad Payne (Vir Linden) 17520c17b1 EXT-6571 WIP - adding ability to handle late-arriving assets 2010-06-11 08:26:18 -04:00
Vadim Savchuk 47211f0ed5 EXT-7716 FIXED Allowed removing an outfit containing links to worn wearables.
Removed a redundant check disallowing removal of an outfit containing links to worn items.
So now we use the same condition as in the inventory panel.

Note that if an outfit that you're trying to remove contains originals of currently worn items, we still disallow removal.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/559/

--HG--
branch : product-engine
2010-06-11 18:22:00 +03:00
Leyla Farazha 56da8017d9 EXT-7210 Baked textures should only be updated when outfit changes are saved or outfit editor is exited.
reviewed and contributed to by Nyx
2010-06-08 14:52:22 -07:00
Alexei Arabadji 50eb27a04d EXT-7644 FIXED Implemented functionality for locking outfit modification controls and used it for 'save outfit' action.
1 Added functionality for locking outfit in LLAppearanceMgr. Outfit should be locked when outfit related operation is started(now it is used for updateBaseOutfit) and unlocked when operation completed or timeout is exceeded.
2 Added outfit saved and outfit lock changed signals to LLOutfitObserver.
3 Updated LLPanelOutfitsInventory and LLPanelOutfitEdit with functionality of controlling 'save outfit' controls state('save outfit' controls should be enabled only if outfit isn't locked and outfit is dirty).
4 Renamed action label of method LLPanelOutfitsInventory::isActionEnabled "make_outfit" to "save_outfit".

--HG--
branch : product-engine
2010-06-08 15:36:48 +03:00
Nyx (Neal Orman) 244321e70c AVP-44 VWR-19699 FIX Multi-wearables and wearable replacement logic
Cleaned up a few things upon code review.

Code reviewed by vir for this checkin as well as following previous commits:
a801af3728ee
af42810b946c
2010-06-04 17:34:46 -04:00
Nyx (Neal Orman) 47beb6dc9c AVP-44 WIP Multi-wearables architecture
One step closer to full support of multi-wearables architecture

code will be reviewed before pushing.
2010-06-03 21:09:49 -04:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
Monroe Linden 1e13fd9260 Partial fix for EXT-6255 (Fix ruthing/replacement wearables logic).
This change should make the logic for missing wearables match what's in the doc linked from the jira.  It doesn't address the case of missing attachments, which will be more complicated.

Reviewed by Nyx and vir.
2010-06-02 14:58:42 -07:00
Vadim Savchuk 142a6c3b8f EXT-6726 WIP Added missing menu items to the Appearance SP.
- Hooked up Wear / Take off / Rename / Delete items in the My Outfits gear menu.
- Added "Create new..." to body part / clothing context menu in Edit Outfit.
- Added "Create new..." submenus to the Edit Outfit gear menu.
- Disabling the "Take Off" menu item of the clothing context menu in the Edit Outfit panel when it's irrelevant.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/494/

--HG--
branch : product-engine
2010-06-02 20:46:16 +03:00
Vadim Savchuk 671625695f EXT-6726 WIP Added more menus to the Appearance SP.
Done:
- Implemented creating new wearables via My Outfits gear menu.
- Implemented renaming/removing/editing an outfit via My Outfits context menu.
- Implemented "Attach to..." / "Attach to HUD..." context submenus.

- Now disabling (instead of hiding) irrelevant wearable context menu items.
- Added "Take Off / Detach" context menu item that's shown for clothes and attachments.
  Useful if you selected a bunch of items and want to take them all off.

- Fixed taking off an outfit
  (not all wearables were taken off because of a wrong inventory collector).
- Fixed crash when editing a skirt
  (reference to a missing string).

- In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables
  and introduced MASK_UNKNOWN per Nyx's request.

Known issues:
- "Attach to..." context menus may be displayed partially off-screen
  (there is the same bug in the inventory panel).
- The way we invoke wearable editing panel after the wearable gets created
  is currently a hack.

TODO:
- Wear / take off / rename / delete an outfit via My Outfits gear menu
  (currently not implemented because of missing selection support in My Outfits).
- Add "Create new..." to body part / clothing context menu in Edit Outfit.
- Add "Create new..." submenus to the Edit Outfit gear menu.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-02 20:46:16 +03:00
Vadim Savchuk 39eb49c5f4 Manual merge from default branch.
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml

--HG--
branch : product-engine
2010-05-31 16:18:22 +03:00
Nyx (Neal Orman) e07deaa3da AVP-44 WIP architectural cleanup for multi-wearables
Implemented some resident-suggested tweaks to better support multiwearables

code reviewed by Seraph
2010-05-28 11:38:37 -04:00
Igor Borovkov ba59f71d5e EXT-7341 FIXED updating My Outfits with wearables ordering information on the very first login
added saving ordering information for wearables of already populated My Outfits category on the very first login

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

--HG--
branch : product-engine
2010-05-28 12:44:28 +03:00
Nyx (Neal Orman) cd46893057 EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor

Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up

All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2

(sorry dessie! :) )
2010-05-27 14:40:49 -04:00
Nyx (Neal Orman) ec7dbc7040 EXT-7213 WIP kill old appearance editor and traces of code
Removed last remaining references to gFloaterCustomize.
Next step: kill the files themselves.
Will be reviewed when complete, before pushing
2010-05-26 18:22:04 -04:00
Mike Antipov 14418c1970 Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
	VWR-13743 FIXED Change Request: Change double click action for inventory wearables
	DEV-33391 FIXED Change Request: Change double click action for inventory wearables

--HG--
branch : product-engine
2010-05-26 10:24:05 +03:00
Loren Shih 00d534d7a7 EXT-7480 Add debuga bility to set texture discard levels
Added TextureDiscardLevel override for specifying texture discard levels.
Aesthetic change to add debug- flag to all avatar debug reporting metrics.
2010-05-25 14:56:45 -04:00
Vadim Savchuk cb05897152 EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/

--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00
Loren Shih 5ab2127fe3 automated merge 2010-05-24 16:40:21 -04:00
Loren Shih 358d23a3a0 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24 16:39:34 -04:00
Nyx (Neal Orman) 536712a041 EXT-7436 FIX pt 2 - added extra check for wearable to prevent log spam
Reviewed by Seraph
2010-05-24 14:18:04 -04:00
Nyx (Neal Orman) a2c3df025c Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 13:12:39 -04:00
Nyx (Neal Orman) 4ef12d1ecf EXT-7436 FIX every other login ruthing.
I think this is related - every time you wear one body part or a single piece
of clothing, it would remove all body parts, causing you to regenerate defaults
which makes you look like ruth. Simple error in logic, body parts should only
be replaced if they are being removed.

Code reviewed by Seraph
2010-05-24 13:12:28 -04:00
Loren Shih 583060bc63 automated merge 2010-05-24 12:55:22 -04:00
Loren Shih b92c1b6d74 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added a bunch of llinfos to track various COF link item actions.
2010-05-24 12:52:50 -04:00
Nyx Linden 8487341b0f AVP-44 WIP Back-end support for multiwearables
Changed a lot of areas of code that were not dealing with multiwearables properly.
Little functionality changed, as the support mechanisms that were out of date were
subtle, but getting closer to no further areas of code that don't properly support
multi-wearables.

Code reviewed by Vir.
2010-05-19 19:48:23 -04:00
Nyx (Neal Orman) b416dcb73b adding verbose logging around your own avatar rez time. Documents load times
for each component texture at each discard level, as well as baked texture
upload times, and reports the timing of each texture to the console when your
avatar sends out its appearance data to the server.

Reviewed by Seraph, will be removed before release.

 -Nyx
2010-05-18 10:20:44 -04:00
Lynx Linden 4b8182ae52 EXT-6964 FIXED Added back the secondlife:///app/appearance SLapp handler.
This was removed inadvertantly in change 1fc92fc19c98.
2010-05-17 15:02:34 +01:00
Loren Shih aebb49520b EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Change enum naming to use WT_INVALID=255 instead of WT_NONE=255.  Added WT_NONE as -1.
2010-05-13 17:24:54 -04:00