Commit Graph

34 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Ansariel 919521d121 Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
Ansariel 62030e9605 Merge bento-box 2016-03-18 11:19:51 +01:00
Brad Payne (Vir Linden) 05bd94268d SL-315 - wip on joint reset 2016-03-10 10:12:25 -05:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 546b276eba Fix merge issue 2015-01-18 17:18:23 +01:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Stinson Linden 0160c514c5 MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers. 2014-05-23 21:56:44 +01:00
Stinson Linden 76023f172c MAINT-4009: Patching a leak of LLVisualParam derived objects that were being leaked because the LLWearable class was not destroying itself properly. 2014-05-14 22:55:19 +01:00
Richard Linden 7956b9e3e8 BUILDFIX: updated enum to match viewer-sunshine so I can get llappearance-utility
building for viewer-interesting
2013-11-09 00:01:52 -08:00
Brad Payne (Vir Linden) 82f147367f SH-3455 WIP - removing bake upload code 2013-09-19 11:10:59 -04:00
Nyx Linden a1ece43905 SH-3875 FIX Failure to bake face wrinkles
Wrinkles have been a deprecated/non-functional feature for a few years now.
Removing the user-facing sliders to prevent confusion.
2013-07-18 16:31:50 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Brad Payne (Vir Linden) f5a4c277cb SH-3500 FIX - added additional logging to allow params in various locations to be distinguished 2012-11-07 15:28:38 -05:00
Brad Payne (Vir Linden) 22f53c8558 additional debugging info, including tracking where visual params live 2012-10-15 18:41:55 -04:00
Dave Parks de1d297dea MAINT-1503 Disable tcmalloc and fix remaining alignment issues. 2012-08-31 14:11:46 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Nyx (Neal Orman) f89bbd3baa EXT-7838 FIX - viewer 2.1 avatars look ruth-shaped to viewer-2 users
Added a third visual param group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
to specify visual params that are user-tweakable, but should not be sent
over the network.

We should have this group *only* for new user-tweakable visual parameters
that should not be sent over the network. These should only be used for
*new* parameters that only contribute to the generation of baked textures.

Code reviewed by Richard
2010-06-24 17:21:18 -04:00
Nyx (Neal Orman) f6406b7174 EXT-2173 use of visual param animation inconsistent at best
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-11 16:37:59 -05:00
Nyx (Neal Orman) a100a6e07f EXT-1947 EXT-1945 EXT-1919 EXT-2088 appearance edit dummy param + animation fix
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-02 19:05:20 -05:00
nyx@NyxTop 65f5348997 EXT-1945 visual parameter animations broken
First round of fixes for trying to fix the visual param animations

Code reviewed by Seraph
2009-10-29 15:13:27 -04:00
Loren Shih 5164ed388c Code audit for r136515 ("merging in new wearable infrastructure...")
No expected functionality change; this mostly contains cosmetic cleanup.

Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
Neal Orman 0d6f1d125e EXT-1664 bugfix for male avatars have female bodies
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-19 18:23:19 +00:00
Neal Orman d08b0b6ae8 merging in new wearable infrastructure to get a step closer to eventually 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-16 17:56:30 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Christian Goetze 5ec8bbbe22 svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Don Kjer e5124431b5 svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00