summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
AgeCommit message (Collapse)Author
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in ↵James Cook
llviewermessages.cpp
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-20mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-19For EXT-2623 - object missing wearables and attachments on initial loginBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-19Merging viewer-2-0 changes into avatar-pipeline branchLoren Shih
--HG-- branch : avatar-pipeline
2009-11-19mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-19EXT-2562 : Somehow show cnotents of what I'm wearingLoren Shih
Added appearanceSP button to toggle folder closed/open state. Also fixed up some bugs with current outfit title placement in appearanceSP.xml Also added a generic call for getting the current outfit folder link
2009-11-18EXT-2581 : Old items still display as "(worn)" even after I change outfitsLoren Shih
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-17Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-17For DEV-34652: OUTFITS (Operations) : Wear folders via drag and drop - ↵Brad Payne (Vir Linden)
handle untyped folder dragged to outfit --HG-- branch : avatar-pipeline
2009-11-17EXT-2568 : Reset Current Look string if wearing from non-outfitLoren Shih
If you wear a category, then the current look string on the appearance sidepanel gets set back to NULL. --HG-- branch : avatar-pipeline
2009-11-17Removed function that was only used for debugging. Defer object suicide ↵Brad Payne (Vir Linden)
until end of the method --HG-- branch : avatar-pipeline
2009-11-17mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-17Sidepanel Appearance refactoring. Work in progress.Loren Shih
1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance) 2. Changed some "Looks" names to "Outfits" 3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming) 4. Took out tab from sidepanel_appearance. --HG-- branch : avatar-pipeline
2009-11-17Deferring work to idle time to avoid recursive notifyObservers calls - added ↵Brad Payne (Vir Linden)
wrapper class to defer an arbitrary boost::bind or other callable --HG-- branch : avatar-pipeline
2009-11-13mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-13Header file cleanupLoren Shih
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel. --HG-- branch : avatar-pipeline
2009-11-13Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-13mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-13LLAppearanceManager cleanup - 2 methods renamedBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-13EXT-2428 : Wearing a look should update the "Current Look" sidepanel stringLoren Shih
Both double-clicking on an outfit to wear, and wearing an outfit from side panel, will now update the current look string. --HG-- branch : avatar-pipeline
2009-11-13removed dead code that was triggering a warning on some platformsBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-12LLAppearanceManager cleanup - removed dead codeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-12LLAppearanceManager cleanup - no static at allBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-12LLAppearanceManager cleanup - turning into proper singletonBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-11Believe this fixes the remaining issues with missing attachment links on ↵Brad Payne (Vir Linden)
first use of 2.0 - EXT-1593 and EXT-1591.
2009-11-09Removed some log file spam.Brad Payne (Vir Linden)
2009-11-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-04Merge the work lost in 49c9461937df back into the treeBryan O'Sullivan
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-04LLAppearanceManager::wearItem() - always check for extra links of same type, ↵Brad Payne (Vir Linden)
even if requested object is already linked.
2009-11-04Remove existing wearables of a type when putting on new ones. This will ↵Brad Payne (Vir Linden)
need to be revisited when we go to multi-wearables.
2009-11-03For EXT-1591: Current Outfit Folder contains duplicate attachment items ↵Brad Payne (Vir Linden)
after relog. --HG-- branch : avatar-pipeline
2009-11-02Work in progress on attachment tracking.Brad Payne (Vir Linden)
2009-10-29EXT-1804: Operations on the current look do not enforce one wearable per typeBrad Payne (Vir Linden)
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-23svn merge -r137024:137071 ↵Loren Shih
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-21svn merge -r136533:136919 ↵Loren Shih
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-16Merge of latest avatar pipeline working branch into viewer2.0 branch.Eric Tulla
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-12Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.Bradley Payne
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-09-29Syncing latest appearance work from avatar pipeline into viewer2.0.Eric Tulla
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-25For EXT-1121: Attaching / detaching objects doesn't affect the Current ↵Bradley Payne
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-24Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for ↵Bradley Payne
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-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, ↵Bradley Payne
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