summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
AgeCommit message (Collapse)Author
2010-12-04merge up to viewer-developmentOz Linden
2010-10-29DN-192 [crashhunters] LLVOAvatar::clearNameTagLeyla Farazha
DN-193[crashhunters] LLHudNameTag::setLabel
2010-09-16MergeLeyla Farazha
2010-09-08automated mergeLoren Shih
2010-09-03Merge Zai Lynch's http://bitbucket.org/ZaiLynch/vwr-19505Tofu Linden
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-26Added graphics preference setting for physics.Loren Shih
2010-08-26fix for VWR-19505ZaiLynch
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-23First pass commit for breast physics.Loren Shih
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-09EXT-8577 FIXED Context menu items for multi-attachmentsVadim Savchuk
Changes: * Implemented bulk-add from My Appearance SP. * Made sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). I stated that in comments. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/844/ --HG-- branch : product-engine
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-08-02merge from dessie/viewer-releaseRichard Nelson
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-07-20EXT-7500: FIXED: Texture Jamming problems with http texture offXiaohong Bao
2010-07-20mergeRichard Nelson
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-15EXT-8135 FIXED Textures blurry when in Appearance Edit modeLoren Shih
EXT-8445 Reduce baked texture timeout fro 120sec to 60sec default Also did some minor infrastructure cleanup, added code comments, etc. There is now separate logic for determining how to handle update (versus upload) requests. Also made a trivial change to llvoavatar to properly encapsulate mAppearanceAnimating. Also reduced the baked texture timeout to 60s (in settings.xml)
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-14Merged from viewer-releaseDessie Linden
2010-07-13Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-07-13EXT-7400: FIXED: 2.0.2 texture queue gets jammed;Xiaohong Bao
EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5
2010-07-13Merged from viewer-releaseDessie Linden
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-07-02mergeRichard Nelson
2010-07-02Merged from viewer-releaseDessie Linden
2010-06-30fix for EXT-7839: texture console is stalled;Xiaohong Bao
fix for EXT-7500: Texture Jamming problems with http texture off;
2010-06-25EXT-8079 - [crashhunters] Crash in LLImagePreviewAvatar::`scalar deleting ↵Richard Nelson
destructor' reviewed by Palmer
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-17Merge (and resolve conflict) from q/viewer-releaseKent Quirk
2010-06-10EXT-7760: FIXED: only 10 avatars render non-impostoredXiaohong Bao
2010-06-03mergeRichard Linden
2010-06-01Merge with dessie/viewer-public in prep to land code thereJames Cook
2010-06-01merge from viewer-publicTofu Linden
2010-06-01EXT-7499 WIP Prevent other avatars from remaining with a ruth shapeTofu Linden
to be reviewed by nyx.
2010-05-28merge from viewer-publicTofu Linden
2010-05-28automated mergeLoren Shih
2010-05-28merge from viewer-publicTofu Linden
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
EXT-7526 FIXED Add baked texture information to texture view First attempt at low res textures after timeout. Added debug setting to control whether low res texture timeout is used. Added baked texture load information to texture view debug display. Trivial name changes to some variables.
2010-05-27mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 01:17:19 +0000