summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
AgeCommit message (Collapse)Author
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-11EXT-2718 avatar render cost higher in 2.0 than in 1.23Nyx (Neal Orman)
previous fix fixed the double-counting of texture costs. resulting ARC was ~99 points higher for most avatars. This patch makes the cost shoot up again, as ARC was improperly computed in 1.23 and before. This makes the cost for an avatar increase 10 points per prim instead of per-attachment, which is how we have documented it. Also used constants to eliminate magic numbers and increased ARC limit from 1024 to 2048. Will request feedback on change from BSI:STU Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
--HG-- branch : product-engine
2009-12-10EXT-3302 invisible avatar w/ bling crashes mac viewersNyx (Neal Orman)
not mac-specific. We were treating IMG_INVISIBLE as a baked texture when an avatar used it as a bake. However, some baked textures have 5 channels, IMG_INVISIBLE has 4. Asking KDU to decode the 5th channel of a 4 channel image resulted in a crash. Fix skips the callback for loading morph masks from a bake if the bake image ID is IMG_INVISIBLE. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2010-02-26automated mergeRoxie Linden
2010-02-24automated mergeRoxie Linden
Don't wanna fix all windows EOL issue here warn-on-failure:unix-eol
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
Some llvoiceclient changes duplicated changes that had already been made in the voice modularization refactor, so the refactor versions were used.
2009-12-07Another merge of include dependency cleanup work with viewer-2-0.brad kittenbrink
2009-12-04EXT-2510 wrong initial hair colorNyx (Neal Orman)
First try at a fix - some weirdness with when we actually should be setting the mesh color or not. Fix is untested as the build is broken. Committing for now so we can re-sync with viewer-2. Will be post-reviewed. --HG-- branch : avatar-pipeline
2009-12-03Fixing hair alpha mask borkage by previous alpha mask patchesNyx (Neal Orman)
Forgot hair alpha cutoff levels should be default for better blending. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-11-30EXT-2769 EXT-2770 alpha masks not working properlyNyx (Neal Orman)
Eyes weren't alpha masked. Hair wasn't being consistently alpha masked Hair alpha mask was being ignored during avatar customization We weren't hitting onFirstTEMessageReceived() All of these were fixed. Also takes care of EXT-2926 EXT-2925 EXT-2974 Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-11-24EXT-2818 no way to get IMG_INVISIBLE as a baked textureNyx (Neal Orman)
reverting unnecessary changes based on code review of previous checkin. Code for both patches reviewed by Seraph. --HG-- branch : avatar-pipeline
2009-11-24EXT-2818 not using IMG_INVISIBLE in baked texturesNyx (Neal Orman)
this patch allows IMG_INVISIBLE in an alpha mask to set the baked texture to also be IMG_INVISIBLE for the appropriate baked texture. Will be post-reviewed with other alpha mask fixes. --HG-- branch : avatar-pipeline
2009-11-23EXT-2718 EXT-2434 avatar render cost changesNyx (Neal Orman)
Fixing a but in new ARC function where textures added 5 to the ARC for each use. Expected (and previous) behavior restored, where 5 is added to ARC for each unique texture, regardless of how many faces it is used on. Confirmed new ARC is 99 points higher than previous (20 for each body part), or 119 if avatar is wearing a skirt. Will be post-reviewed before pushing --HG-- branch : avatar-pipeline
2009-11-18EXT-2539 confirm we're not sending local texture IDs in appearance msgNyx (Neal Orman)
created a throwaway function to temporarily set local texture IDs in the avatar object to IMG_DEFAULT_AVATAR immediately before sending the TE message, and restore the IDs when we're done. Will implement a more elegant solution for 2.1. This is the least risky implementation, though it isn't elegant. Code reviewed by Seraph
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in the long run this will reduce build time. Also cleaned up a lot of header file usage to conform better to the coding standard. reviewed by james and steve.
2009-11-13EXT-2434 update rendering cost to reflect changes in avatar renderingNyx (Neal Orman)
finished the updates to avatar rendering cost and formalized the display of selected object render cost in the build tools floater. Both checkins reviewed by Vir.
2009-11-12EXT-2434 update avatar rendering costNyx (Neal Orman)
First crack at updating the rendering cost calculation for avatars to account for the possibility of invisible avatars. Also generalized rendering cost of attachments to be more general - added debug code to build floater will be post-reviewed
2009-11-11fixing build - last commit had bad call to startAppearanceAnimationNyx (Neal Orman)
function definition of startAppearanceAnimation chagned - last patch missed eliminating the parameters at line 6594 in llvoavatar.cpp. This patch fixes the issue, confirmed builds and runs locally.
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.Tofu Linden
2009-11-06magic number removal rampage: 3.14159 -> M_PI or F_PITofu Linden
--HG-- branch : texture-pipeline
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
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-28EXT-1930 - Crash after failed region crossing then teleport. Null pointer ↵Palmer
accessed. Reviewed by Nyx
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-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-19mergeSteve Bennetts
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-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-25SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. ThisMartin Reddy
fixes all of the parentheses warnings in the code. Original patch was reviewed by merov (and others).
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 10:12:01 +0000