aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Delete a big bunch of unused variables.David Walter Seikel2013-04-081-7/+0
|
* For Armin and his teapot.David Walter Seikel2012-04-291-0/+5
|
* Revert "Reverted ability to customize the Imprudence client tag color."McCabe Maxsted2011-09-081-181/+198
| | | | This reverts commit 87219855c664447a39dd7c2d8866f0a630d1c843.
* Reverted ability to customize the Imprudence client tag color.Jacek Antonelli2011-06-141-198/+181
| | | | | | | | | The Imprudence tag color is part of our official branding. Users can turn it off, but the color itself is not a matter of user preference. This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233 and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two widgets from Preferences > Colors.
* Auto-deRuth code, by way of Siana Gearz and the Phoenix viewer.Aidan Thornton2011-05-271-1/+52
| | | | | [ From Tonya Souther's 672:143c811ee5e2 and 688:1900969ebf65 in phoenix-sg ] (cherry picked from commit d3ffe737a82e4bf54ce1413efeb7e92f43dfccca)
* Merge remote-tracking branch 'armin/misc' into nextJacek Antonelli2011-05-221-1/+1
|\
| * fix default unloaded avatar cloud particle texture not loadingArmin Weatherwax2011-05-171-1/+1
| |
* | Merge branch '1.3-maint' into nextJacek Antonelli2011-05-181-4/+2
|\ \ | |/ |/| | | | | | | | | Conflicts: linden/indra/llcommon/CMakeLists.txt linden/indra/newview/llvoavatar.cpp linden/indra/newview/viewer_manifest.py
| * VWR-25479: Avatar physics causing broken shapes on other viewers.Jacek Antonelli2011-05-131-7/+1
| | | | | | | | Patch by Seraph Linden.
* | Merged Experimental branch (exp) back into main line (next).Jacek Antonelli2011-05-081-330/+523
|\ \ | |/ |/| | | | | | | | | | | Git thought many files (almost 100) had merge conflicts. But, after resolving the conflicts (which were mostly trivial), almost all the files turned out to be the same as in the exp branch. So, the conflicts are not listed here. Check the diff between commit 244ffe8 and this commit to see what really changed.
| * Fixed a compile error (and what I assume to be a source error) in 9cb3d883McCabe Maxsted2011-04-191-1/+1
| |
| * fix some flaws in the cloud particle prefsArmin Weatherwax2011-04-191-7/+18
| |
| * add some basic cloud preferences in prefs > advanced >eye candy - please ↵Armin Weatherwax2011-04-191-3/+37
| | | | | | | | review perms
| * Modified tag color setting to change the color for all Imprudence tags the ↵McCabe Maxsted2011-04-191-181/+197
| | | | | | | | client sees. Hardcoded colors are now used for Imp
| * Added custom nametag coloring for Imprudence tags (local only)McCabe Maxsted2011-04-191-2/+3
| |
| * cleaned up particle system llsd de/serialization; improvements to the avatar ↵Armin Weatherwax2011-03-251-1/+9
| | | | | | | | | | | | | | | | cloud * llsd now uses camel case for each key, confusion of particle max age vs source max age fixed * cloud.xml is now loaded with a fallback chain PER_SL_ACCOUNT -> USER_SETTINGS -> APP_SETTINGS so that customized clouds can exist per account or for all users and survive updates
| * Tazy Scientist: Feature #759 Particle Chat EnhancedArmin Weatherwax2011-03-101-28/+35
| | | | | | | | | | script is here: http://redmine.kokuaviewer.org/attachments/164/script.txt I (ArminW) added also a ParticleChatCannel setting to Tazys patch.
| * Beeks: Serious fix for the Tintable tattoos!Armin Weatherwax2011-01-291-17/+17
| | | | | | | | This needs moving the new avatar_lad.xml file from the Imprudence toplevel directory to linden/indra/newview/character/
| * Update: Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers v6->v9Armin Weatherwax2011-01-291-13/+16
| | | | | | | | issue tattoo tinting does not work
| * Add an UI for Display name settings to prefs general, make the setting more ↵Armin Weatherwax2011-01-251-1/+1
| | | | | | | | | | | | | | intuitive instead: of 0 legacy only , 1 both and 2 display names only we use now: 0 legacy, 1 display names only and 2 both
| * Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-241-7/+73
| |
| * load unloaded-avatar-cloud particle system from LLSD file.Armin Weatherwax2010-12-221-28/+17
| |
| * Applied patch by Ansariel Hiller for #689: Optionally disable internal hover ↵McCabe Maxsted2010-11-121-0/+9
| | | | | | | | (fly) up animation
| * Rename hippo* files to lower case (PART 2 OF 2)Aleric Inglewood2010-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming.
| * Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-021-4/+16
| |\ | | | | | | | | | browser/media plugin support
| | * Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-281-7/+7
| | |\
| | * \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-21/+38
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| | | * | Port of SNOW-802: Use UDP for baked textures.thickbrick2010-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of SNOW-802 from SG1. Originally ported by Robin cornelius from SG 2.1. Also added a paramter can_use_http to the LLTextureFetchWorker constructor, to avoid messing with locks.
| | * | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-64/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Viewer 2 texture system" This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h
| | * | | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-101-36/+78
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| | | * | | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-231-34/+64
| | | | | | | | | | | | | | | | | | | | | | | | texture system
| | | * | | llmediaplugins first stepArmin Weatherwax2010-09-231-2/+15
| | | | | |
| * | | | | Finishes the OpenRegionSettings module, adds a new panel to Region/Estate ↵RevolutionSmythe2010-11-011-2/+1
| | |_|_|/ | |/| | | | | | | | | | | | | for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
| * | | | Ask for at least 512^2 pixels of local texture before bakethickbrick2010-10-171-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Not sure this helps with non-baking, but it looked wrong. Also, only bind local texture before they are covered by a bake.
| * | | | Port of SNOW-802: Use UDP for baked textures.thickbrick2010-10-161-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Port of SNOW-802 from SG1. Originally ported by Robin cornelius from SG 2.1. Also added a paramter can_use_http to the LLTextureFetchWorker constructor, to avoid messing with locks.
| * | | Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-21/+37
| |/ /
| * | Allow build under Mac OS X 10.6 SDK by removing deprecated things.Mimika Oh2010-10-081-0/+2
| | | | | | | | | | | | | | | | | | Incorporated Snowglobe changesets: http://svn.secondlife.com/trac/linden/changeset/2823 http://svn.secondlife.com/trac/linden/changeset/2757
| * | Implemented friends tags highlighting, including preferences->general ↵elektrahesse2010-10-081-6/+11
| | | | | | | | | | | | checkbox to enable/disable the feature. The font on the tags is rendered in bold when the option is active.
| * | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-011-8/+8
| | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/556
| * | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)McCabe Maxsted2010-09-251-10/+25
| | |
| * | don't rely on indexed color extension(SNOW-220)Nemurimasu Neiro2010-09-231-1/+0
| |/
| * Fix for crash on bad teleportsMcCabe Maxsted2010-09-101-1/+1
| |
| * Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.eMcCabe Maxsted2010-08-191-18/+23
| |
| * Don't list clients as 'Failure' as it confuses people and isn't very niceMcCabe Maxsted2010-08-071-1/+1
| |
* | Allow build under Mac OS X 10.6 SDK by removing deprecated things.Mimika Oh2010-10-031-1/+2
| | | | | | | | | | | | Incorporated Snowglobe changesets: http://svn.secondlife.com/trac/linden/changeset/2823 http://svn.secondlife.com/trac/linden/changeset/2757
* | Fix for crash on bad teleportsMcCabe Maxsted2010-09-161-1/+1
| |
* | Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.eMcCabe Maxsted2010-08-261-18/+23
| |
* | Don't list clients as 'Failure' as it confuses people and isn't very niceMcCabe Maxsted2010-08-261-1/+1
|/
* move llwarns ... "Grav SET to" ... to LL_DEBUGS("BodyPhysics")Armin Weatherwax2010-08-021-3/+3
|
* small show client name of others tweakingArmin Weatherwax2010-08-021-11/+19
|