summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
AgeCommit message (Collapse)Author
2010-12-08merge with viewer-devRichard Linden
2010-11-30STORM-584 FIXED Chat font colors for "Me" and "Others" used for the bubble ↵Seth ProductEngine
chat text. Bubble chat color picker now sets the background color for the name tag and bubble chat. Label for the color picker changed to "Bubble chat background" Removed unused "BackgroundChatColor" setting, using "NameTagBackground" instead.
2010-11-15mergeRichard Linden
2010-11-12Merge latest from lindenlab/viewer-developmentDave SIMmONs
2010-11-05Merge latest from lindenlab/viewer-developmentDave SIMmONs
2010-10-15sync up to viewer-developerTofu Buzzard
2010-10-13Fix for EXP-220 -- Remove voice dot for skylight userMonroe Linden
Reviewed by Richard.
2010-10-12Initial work on viewer motion interpolation. Changes include:Dave SIMmONs
* InterpolationTime and InterpolationPhaseOut values in settings.xml to control new object interpolation code. Use zero to revert to old logic * Viewer motion interpolation lasts InterpolationTime and will start to phase out after InterpolationPhaseOut seconds * Changed LLWorld::getMinAllowedZ() to take a world-position as a parameter * Added LLVOAvatarSelf::resetRegionCrossingTimer() * Actually reset LLVOAvatarSelf::mRegionCrossingTimer so we get sensible timing data for region crossings * LLVOAvatarSelf::updateRegion() will update position value due to region changes Code reviewed by Ambroff *
2010-10-10VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.Tofu Linden
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-09-29MergeLeyla Farazha
2010-09-22SH-188 FIX crash in llvoavatar.cppNyx (Neal Orman)
We were using a NULL pointer after checking it. Did some logic juggling to ensure that we only use the pointer if it is non-null Code reviewed by Seraph (transplanted from a90fe10ddac9545249c6f218af438a36bcbc3162)
2010-09-16As a resident, when I elect to see friends names in green, it should also ↵Leyla Farazha
colour their group tags so that the name tags don't look like crap. This also applies to status message - Away/Busy in nametag
2010-09-16MergeLeyla Farazha
2010-09-15[STORM-176] Clean up handling of the maximum length of chat messagesOz Linden
2010-09-09VWR-22052 FIX tons of processAvatarAppearance spam, may be flooding serverNyx (Neal Orman)
Added a timeout so that we will only send this message a max of once a minute. Investigated cause of server not sending visual params with texture message, it appears it only happens if the sim cannot find the visual params to send. Not sure what causes that condition. Code reviewed by Seraph
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-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-20Merge from dessie/viewer-releaseLeyla Farazha
2010-08-20merge from viewer-releaseTofu Linden
2010-08-18EXT-8542 FIX (?) Avatar goes nude on teleport / outfit changeNyx (Neal Orman)
Believed fix, but having difficulty reproducing to verify. changed logic in switching avatar textures so that we don't use the local baked texture until we have at least the lowest LOD for each clothing texture. Will ask Dan to help verify the fix. Code reviewed by Seraph
2010-08-13trivial comment changes while I was in this code.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12merge from viewer-releaseTofu Linden
2010-08-11EXT-8650 Can wear mutliple copies of a no-copy item via object linksLoren Shih
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code Lots of files changed, but this is mostly just a trivial function call rename. This change is very low risk.
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-06merge from viewer-releaseTofu Linden
2010-08-06EXT-8579 FIXED Develop.Avatar.Animation Info should not show asset IDsTofu Linden
Made it so that you only see real UUIDs if the viewer thinks you are in real godmode.
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-22EXT-8051 FIXED Change cameraCustomizeAvatar calls to use ↵Loren Shih
gAvatarp->isUsingBakedTextures Changed some uses of cameraCustomizeAvatar as appropriate.
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-8301: FIXED: crash at LLViewerFetchedTexture::cleanup() [secondlife-bin ↵Xiaohong Bao
llviewertexture.cpp]
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-14Merged from viewer-releaseDessie Linden
2010-07-13trivial: convert to UNIX line endings.Xiaohong Bao
2010-07-13Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao