Commit Graph

57 Commits (ec7dbc704040dfcdcd101f090dbb2f780ca0ee8a)

Author SHA1 Message Date
Nyx (Neal Orman) b524aacb59 EXT-7213 WIP kill old appearance editor and all traces of code
First pass - eliminated all references to gFloaterCustomize except
those that call saveIfDirty. Haven't compiled, haven't reviewed.
Will clean up in further patches and get reviewed before pushing.
2010-05-25 20:17:23 -04:00
Nyx (Neal Orman) f91481c82f EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" mode
Avatar now enters "appearance editing" mode when opening the outfit or
wearable editors in the sidepanel. Changed code to ensure we don't
accidentally switch out of it and back in when switching from one to the other.

Note that this cuts out LLFLoaterCustomize from being built and shown to the user
from any UI. The code for this (and related classes) will be removed once we have
pulled any code out of it that we still need. The current outfit and wearable
editors should be working sufficiently for most purposes. Bugs should be reported
to Nyx Linden or the avatar team.

Code reviewed by Vir
2010-05-21 17:02:53 -04:00
Vadim Savchuk 9aacdbc155 EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context menu and made it open the shape editing panel.
Again, as in EXT-7241, I tried to improve the way the appearance panels (outfits / edit outfit / edit wearables) are switched, this time aiming to eliminate redundant time-consuming operations (fetches/updated/etc).
I'm not particularly satisfied with the resulting code but it seems to work. A better solution might be to wrap the panels with LLSideTrayPanelContainer.

Additional minor changes:
- Fixed unsafe pointer cast in LLSidepanelAppearance::editWearable().
- Removed redundant onEditOutfitButtonClicked() and onEditWearBackClicked() methods from LLSidepanelAppearance.

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

--HG--
branch : product-engine
2010-05-19 14:03:29 +03:00
Vadim Savchuk 53a5b74af1 EXT-7241 FIXED Changed all "Edit Appearance" links to "Change Outfit" and pointed them to the My Outfits tab.
Renamed the following menu items to "Change Outfit" and made them open My Outfits tab:
- Avatar in-world context menu -> My Appearance.
- Avatar inspector menu -> My Appearance.
- Me -> My Appearance.

To enable the Appearance SP switch to My outfits I cleaned up the logic of switching between my outfits <-> edit outfit <-> edit wearable panels.

Also done the following cleanups and minor improvements:
- Removed unused LLSidepanelAppearance::mEditBtn and mLookInfoType members.
- Removed empty LLSidepanelAppearance::updateVerbs() method.
- Made the "params" argument of LLSideTray::showPanel() and togglePanel() optional.

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

--HG--
branch : product-engine
2010-05-15 14:40:15 +03:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Vadim Savchuk d39ef5ce6f Implemented task EXT-7156 (Appearance panel: "Wear" button should become disabled and a loading indicator should appear next to the outfit name).
When user presses the "Wear" button in the outfits list, we disable the button and display a perpetual loading indicator until all wearables of the outfit being worn get loaded.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/347/

--HG--
branch : product-engine
2010-05-05 13:19:24 +03:00
Vadim Savchuk ccd4215fd4 Implemented task EXT-6559 (Appearance panel: Add edit button in place of the image display next to current look).
- Changed the topmost part of the Appearance panel:
  * Added new "Edit current outfit" button.
  * Implemented COF status display (unsaved/wearing) according to the spec.
  * Minor XUI changes (font / dimensions / bg color).
- Removed the temporary "Edit current outfit" button from the bottom of the Appearance panel.
- Removed the temporary "ShowDebugAppearanceEditor" setting.

TODO: use icons from the spec (currently missing).

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

--HG--
branch : product-engine
2010-04-30 19:55:00 +03:00
Mike Antipov 872b4d7ed0 Fixed critical bug EXT-4837 ( [NUX] When filter results in null state, provide a message suggesting the user try global search.)
Implemented passing of entered filter substring without head spaces to search URI in help message for null filtered results.
* Updated setting "no item message" to use search term from filter editor for avatar & group lists and for inventory panels.
* Updated appropriate translatable strings to get [SEARCH_TERM] substitution.
* Updated processing of filter substring to pass original string to methods applied new filter.

Additional necessary changes
* Changed place to set "no item message" for group list from refresh to where filter is updated (like in avatar lists)
* Removed converting of filter substring to upper case in Places & My Appearance sidepanels (this conversion has already been implemented in where filter is applied)
* Added a separate message for Landmarks to set search URI to secondlife:///app/search/places for Lanmarks panel;
 other inventory related panels have URL to all searched categories (secondlife:///app/search/all)

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

--HG--
branch : product-engine
2010-04-28 11:00:53 +03:00
Dmitry Zaporozhan 2ce7556e53 Implemented by SL EXT-6722(normal task) - Create modified inventory view for "my outfits" tab in top-level appearance sidebar (tier 1)
llui:
- Setting container panel for accordion tab control to dynamically add tabs to accordions.
- Added method to dynamically remove accordion tabs.
- Added LLIconCtrl image setter.

newview:
- Class LLOutfitsList - a list of agents's outfits from "My Outfits" inventory category which represents each outfit by an accordion tab with a list of items inside it.
- Class LLWearableItemsList - a list of wearable items used in each accordion tab of "My Outfits" tab.
- Class LLInventoryItemsList - a base class for LLWearableItemsList that represents inventory items by panels in LLFlatListView.
- Class LLPanelInventoryItem - inventory item representation for a flat list. Item icon is set according to item type.
- Class LLInventoryCategoriesObserver - an observer used in LLOutfitsList for monitoring changes to "My Outfits" inventory category and updating outfits accordion tabs and list of items for each outfit.

Known issues:
- Only first outfit tab is displayed in "My Outfits" until this tab is expanded.
- Bottom bar buttons and filter field not functioning for "My Outfits" tab since LLOutfitsList still doesn't support selection, filtering and sorting.
- "My Outfits" and "Wearing" tabs of "Appearance" side panel might need a common interface to use LLOutfitsList and LLinventoryPanel as tabs in LLPanelOutfitsInventory or "Wearing" tab should be replaces with LLOutfitsList class object i.e. a flat list.

On review - https://codereview.productengine.com/secondlife/r/285/

--HG--
branch : product-engine
2010-04-21 15:44:24 +03:00
Loren Shih 85f54aca0f automated merge 2010-04-13 16:39:12 -04:00
Igor Borovkov ee310b4131 merge
--HG--
branch : product-engine
2010-04-09 12:37:38 +03:00
Igor Borovkov 9d93441b31 done EXT-6687 Implement Save button functionality (Edit Outfit panel)
Implemented "Save", "Save as new" functionality. If the base outfit doesn't exist "Save as new" functionality is employed

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

--HG--
branch : product-engine
2010-04-09 12:30:33 +03:00
Loren Shih 52293aa4bb automated merge 2010-04-07 14:47:25 -04:00
Tofu Linden adce2ecdf8 PE merge from pe-viewer-trunk 2010-04-07 13:03:35 +01:00
Loren Shih f096f02278 EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06 18:58:26 -04:00
Loren Shih cdbdb11686 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
2010-04-06 14:47:20 -04:00
Loren Shih ec5bd9c857 automated merge 2010-04-06 10:19:31 -04:00
Loren Shih 785d4c34b6 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
Preliminary work to clean up naming conventions.
2010-04-06 10:19:15 -04:00
Tofu Linden 613c84fc67 merge 2010-04-06 13:18:35 +01:00
Vadim Savchuk 4a997e9627 Merge from default branch
--HG--
branch : product-engine
2010-04-06 17:17:33 +03:00
Tofu Linden 20c660569d merge 2010-04-02 21:49:45 +01:00
Loren Shih 568d6ed229 EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'s
Fixed some more typedefs that I missed in first checkin.
2010-04-02 15:19:44 -04:00
Igor Borovkov 43d756a7dc done EXT-6674 Switch Edit Outfit panel (list at the top) to show content of the Current Outfit system folder
reviewed at https://codereview.productengine.com/secondlife/r/159/

--HG--
branch : product-engine
2010-04-02 13:58:16 +03:00
Loren Shih 2854008e8e automated merge 2010-04-01 17:54:08 -04:00
Loren Shih 5372782d50 EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView *rootFolder"
Superficial cleanup - changed all instances to "LLFolderView* root".
2010-04-01 14:29:23 -04:00
Dmitry Zaporozhan 3c036ef49b (work in progress) EXT-6564(major) - Fix wearable editing panels
Fixed Edit Shape panel layout:
- fixed widget positioning according to spec
- added gear button bar
- fixed accordion positioning
- fixed parameter list positioning

TODO:
- fix parameter panel positioning
- apply changes to the rest of wearable panels

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/149/

--HG--
branch : product-engine
2010-04-01 17:41:47 +03:00
Mike Antipov bba457e889 Merge from default branch
--HG--
branch : product-engine
2010-03-31 10:08:50 +03:00
Nyx (Neal Orman) cc3f4c1f59 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-03-30 15:20:37 -04:00
Nyx (Neal Orman) dbcd12a4d1 EXT-6633 enable basic multiwearables demo
Fixed several areas of code that were not multi-wearables enabled.
Specifically allowed for the wearing of created outfits that had links to
multiple items of the same type. Such outfits can be created by dragging
multiple items of the same type into an unworn outfit folder. When you
wear the outfit, all items (up to 5 per type) should be worn. Does not
affect right-click options or other buttons.

Code reviewed by Vir.
2010-03-30 15:17:14 -04:00
Vadim Savchuk 3e23c04c9b Merge from default branch
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Brad Payne (Vir Linden) 4ff53b9066 For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout 2010-03-29 11:02:39 -04:00
Igor Borovkov f55af5fcdf done EXT-6547 Rename stuff related with Panel Look Info to Panel Outfit Edit
renamed panel_look_info.xml to panel_outfit_edit.xml
renamed llpanellookinfo.cpp/llpanellookinfo.h to llpaneloutfitedit.cpp/llpaneloutfitedit.h
renamed LLPanelLookInfo to LLPanelOutfitEdit

Reviewed at https://codereview.productengine.com/secondlife/r/130/

--HG--
branch : product-engine
2010-03-29 14:07:40 +03:00
Loren Shih 0bcfbde3a4 EXT-6536 : Make LLVOAvatarSelf a singleton
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26 13:58:19 -04:00
Loren Shih 885fc3f9b5 EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Nyx (Neal Orman) 51010803df First draft of changes for avatar outfit panel, so PE can start working on it.
Demo code, will get cleaned up / extended through future work on the project - just need to check it in to collaborate.
2010-03-10 16:38:00 -05:00
Tofu Linden ef515029b6 CID-80
Checker: FORWARD_NULL
Function: LLSidepanelAppearance::onOpen(const LLSD &)
File: /indra/newview/llsidepanelappearance.cpp
2010-02-10 18:05:49 +00:00
Nyx (Neal Orman) b0b6890373 EXT-4253 "unsaved" detection seems buggy
Corrected bug where saving an outfit wouldn't update the "unsaved" marker on
the UI. Also switched the UI to use a popup dialog to request the name of
the outfit being made, as we could not convey everything we needed to on the
button alone.

Code reviewed by Vir
2010-01-15 14:57:00 -05:00
Loren Shih 79542fe8e7 EXT-4154 : Memory leak from FetchObservers in AppearanceSP
Member observers of LLSidepanelAppearance are now deleted appropriately.
2010-01-11 14:15:32 -05:00
Nyx (Neal Orman) a5a0f57120 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-08 13:15:22 -05:00
Nyx (Neal Orman) cdb6f67f71 EXT-3958 title needs to update appropriately when changes made to outfit
We now show a string "(unsaved)" under the appearance panel outfit title
when the currently loaded outfit has been modified from its original state.

Tested with following conditions:
1) item added to loaded outfit
2) item removed from loaded outfit
3) item replaced in loaded outfit

Appears to work properly on login as well. Checking is a manual folder compare,
but should be fairly efficient.

XUI changes submitted by Erica

Entire diff reviewed by Vir
2010-01-08 13:10:15 -05:00
Loren Shih 08a9c1eae0 EXT-3961 : Switch order of "Wearing" and "My Outfits" tabs
Trivial name change to turn "accordionpanel" into "tab" for outfits tabs since those are no longer accordions.
2010-01-06 15:08:20 -05:00
Loren Shih cdb158e9e0 EXT-3954 : "Wear" button shouldn't be enabled in "Wearing" tab
EXT-3952 : "Make Outfit" button shouldn't be enabled in "Wearing" tab
EXT-3955 : "Add to Current Outfit" gear menu option confusing, remove it
EXT-3961 : Switch order of "Wearing" and "My Outfits" tabs

Most of these are very minor xui/button-state changes.
Also added a new onOpen method to llpaneloutfitsinventory so that it can update its state (notably, which tab is active) when the sidepanel is opened.
2010-01-06 12:33:28 -05:00
Nyx (Neal Orman) 60959b39c6 EXT-3948 outfit title does not update on outfit creation
now on creating a new outfit we remove the old base folder link and replace it
with a link to the newly created outfit folder. Responsive UI FTW!

Code reviewed by Vir
2010-01-05 16:20:01 -05:00
Nyx (Neal Orman) 4cc5f81ddf EXT-3370 integrate tab-ification to appearance sidepanel
Moved elements around so that the bottom bar is contained in the outfits panel
XUI changes by erica/chuck/nyx
code changes by nyx

code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-14 17:17:40 -05:00
Brad Payne (Vir Linden) 98c74f4eb8 For EXT-2637: Renaming outfit that's currently worn should update Current Outfit string
--HG--
branch : avatar-pipeline
2009-12-07 15:02:31 -05:00
Loren Shih 06fd219245 EXT2825 : Clicking on Outfit Opener in AppearanceSP should open outfits accordion
--HG--
branch : avatar-pipeline
2009-11-24 20:39:28 -05:00