summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.cpp
AgeCommit message (Collapse)Author
2009-12-01automated merge for viewer-2.0 -> avp.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in ↵James Cook
llviewermessages.cpp
2009-11-25EXT-2769 hair alpha not applied immediatelyNyx (Neal Orman)
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-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-23EXT-2535 wearables created in 2.0 don't load in 1.23Nyx (Neal Orman)
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-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-17EXT-2535 wearables saved in 2.0 don't load in 1.23Nyx (Neal Orman)
Incrementing wearable version number was a bad thing here - we want to keep all wearables reporting as version 22 until we make a breaking change. Reverted the version number and put in a hack to force any version 24 wearables to be re-saved as version 22. The hack can be removed before release, as it should only affect internal testers. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-11-13EXT-2429 body parts out of sync with COFNyx (Neal Orman)
Visual param definitions weren't working properly when the wearable being loaded had fewer visual parameters than the current definition of the wearable. This occurred when you were loading wearables that had been created in older versions of the client (or from the library). Added missing parameters to mSavedVisualParamMap, and modified revertValues() to ensure that the two maps are kept fully in sync on finishing loading the wearable and when reverting the values. Code reviewed by Vir --HG-- branch : avatar-pipeline
2009-11-11EXT-2173 use of visual param animation inconsistent at bestNyx (Neal Orman)
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-09EXT-2326 Editing appearance causes too many texture callbacks stalls the viewerNyx (Neal Orman)
problem was caused by triggering updateMeshTextures() every time visual params or textures were changed on your base avatar object. The latest structure makes the parameters and textures in the wearables authoritative, causing them to be copied to the avatar on a regular basis. This resulted in way too many callbacks to be registered while waiting for baked textures to be uploaded. Fixed by removing many calls to updateMeshTextures() and ensuring that it gets called every time an appropriate param or texture actually changes, or a wearable gets added/removed. This appears to cut the number of callbacks to a reasonable level. Code reviewed by Bigpapi.
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-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-11-02EXT-1947 EXT-1945 EXT-1919 EXT-2088 appearance edit dummy param + animation fixNyx (Neal Orman)
Several fixes here: 1) minor rename in argument of setIsDummy 2) corrected parameter set_by_user to calls of setVisualParamWeight where we shouldn't be animating 3) ensured finally that mIsDummy is set properly for all wearable parameters 4) ensured that mIsDUmmy is set properly for non-wearable based parameters on your own avatar Code reviewed by Bigpapi
2009-10-29EXT-1947 layer visual params don't invalidate baked texturesNyx (Neal Orman)
cloned visual params were picking up the mIsDummy flag from their parents. modified the createVisualParams function to reset this flag. code reviewed by Seraph
2009-10-29EXT-1945 visual parameter animations brokennyx@NyxTop
First round of fixes for trying to fix the visual param animations Code reviewed by Seraph
2009-10-29EXT-1919 Appearance editor param sliders ineffective after savenyx@NyxTop
Visual param sliders were not being updated to affect the new wearable created after a save was performed. Created a reset() function to do this which gets called after the new object is created. Code reviewed by Seraph
2009-10-28mergeSteve Bennetts
2009-10-26EXT-1816 Wearable changes do not persistNeal Orman
issue was in the isDirty() function - one case where images in the wearable get added caused the function to return FALSE when it should have returned TRUE. Now wearables that you change the images of will be detected as dirty and will save properly. Code reviewed by Bigpapi.
2009-10-23mergeSteve Bennetts
2009-10-22EXT-1822 changing textures in appearance not immediateNeal Orman
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-22mergeSteve Bennetts
2009-10-22Fix the Mac and Linux build after llwearable breakage. Needed to addLynx Linden
an explicit include for LLViewerFetchedTexture because it's used for a template specialization, and fixed LLLocalTextureObject constructor to take a const LLUUID reference so locals can be passed.
2009-10-22Fix for Mac build.Steven Bennetts
2009-10-21Code audit for r136515 ("merging in new wearable infrastructure...")Loren Shih
No expected functionality change; this mostly contains cosmetic cleanup. Reviewed by: Nyx
2009-10-19EXT-1664 bugfix for male avatars have female bodiesNeal Orman
Found a couple bugs in the code relating to cross-wearable visual param linking. Fixed with this patch - cross-wearable and inter-wearable visual params should now link properly for both wearable-owned and avatar-owned parameters. Code reviewed by Seraph
2009-10-16merging in new wearable infrastructure to get a step closer to eventually ↵Neal Orman
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-07-14QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branchNeal Orman
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-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-05svn merge -r106715:HEAD ↵Kent Quirk
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
DEV-11202: Unhandled Excpetion in pipeline.cpp. Merged over updated windlight ui help text from windlight14. Reverting a const change in a virtual that was not propagated to all overrides. DEV-10957 stop and pause Media and music buttons do not work DEV-10762 Displayed page in the client browser disappears when crossing property boundaries. DEV-11220 replace misspellings in alerts.xml parameters of 'messsage' DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip DEV-11193 clean up some viewer strings related to Windlight help text svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads DEV-11110 Media browser history dropdown does not save items across sessions Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing. DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown dev-10623 "parcels that played movies no longer work in combo-merge-ui" DEV-11379 - crash in LLTabContainer::draw() DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview DEV-11158 sculpties on the top10 crash list DEV-11404 "Send Current URL to Parcel" does not set the MIME type merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database. DEV-10489: no draw distance cheating DEV-879: water noise frequency DEV-10764: macbook air support DEV-10878: Linux Intel945 support DEV-7551: featuretable adjustments for framerate. DEV-11426 Enormous mini-map. DEV-11505 - Crash in gunzip_file. Removed final LinkedList, SkipMap, and AssocList templates from the Viewer! DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-24merge -r 56696:57082 Branch_1-13-2Steven Bennetts
2007-01-02Print done when done.James Cook