summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
AgeCommit message (Collapse)Author
2009-11-13branch mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-12EXT-2387 crash on dump local texturesNyx (Neal Orman)
we didn't check local_tex_obj for NULL before using it. checked to make sure pointer is not null before calling ->getImage()
2009-11-12EXT-2354 menus contain multiple lines not editable in XUINyx (Neal Orman)
We're building a pie menu in code, complete with separators for this particular branch of submenus. This is terrible and ugly and needs to be killed, but for now I removed the lines that cause the separators to be added where there are empty pie slices. Code reviewed by Vir
2009-11-12LLAppearanceManager cleanup - turning into proper singletonBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-11DEV-34507 too many baked texture uploadsNyx (Neal Orman)
Fixed a double-bake bug on hitting the "OK" button of the appearance editor Also cleaned up extraneous calls to requestLayersetUpload. Behavior should now be consistent with resident expectations. Code reviewed by Bigpapi
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-06mergeSteve Bennetts
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06EXT-1823 avatar shape corrupted with huge legs/feetNyx (Neal Orman)
As suspected a morph mask issue. Apparently we were setting success to false if the user specifies a pant or shrit texture without an alpha channel. Result: bad morph masks. Patch begins to clean up the isMorphMaskValid issue, as well as fixing this error. Code reviewed by Vir
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
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-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2009-11-03For EXT-1591: Current Outfit Folder contains duplicate attachment items ↵Brad Payne (Vir Linden)
after relog. --HG-- branch : avatar-pipeline
2009-11-03For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]Loren Shih
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
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-11-02Work in progress on attachment tracking.Brad Payne (Vir Linden)
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-26mergeSteve Bennetts
2009-10-23EXT-1809 Wearing an item doesn't update avatarNeal Orman
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-23mergeSteve Bennetts
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-21mergeSteve Bennetts
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-20EXT-1664 male avatars have female bodiesNeal Orman
Previous patch improved the situation but reversed it - it was still possible to have a mismatch between an avatar's head and body for their gender. This patch makes the copying of the gender from your shape wearable to your avatar more explicit, which appears to fix the issue for now. This should get the behavior correct for testing purposes, and we will look into fixing more underlying issues for the next cycle. Code reviewed by Seraph
2009-10-19mergeSteve Bennetts
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16svn merge -r134817:136516 ↵Loren Shih
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-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-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-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
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-24Disable MSVC "fatal warning" 4702 for boost::lexical_cast in Release buildNat Goodspeed
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
Bug Fixes: * EXT-637 EXT-595 Dev work: * EXT-694 QA: * Be sure feature works on other locales Known issues: * If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts. * It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy. * If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-18svn merge -r130469:130817 ↵Loren Shih
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-03merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 QA: New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing. Many other changes to the bottom bar. Changes to local chat behavior.
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-07-09DEV-34804 right click object more>attach HUD, hover and a black bar appearsRichard Nelson
reviewed by Austni
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
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-06-24merge -r125267:125272 ↵Loren Shih
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-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 01:29:10 +0000