Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Tank_Master
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
Richard Linden
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
Baker Linden
a72e34a345
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Baker Linden
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Cinders
b5ec05f9d9
Revert SH-4050 which causes the avatar to be shoved into the ground under certain circumstances
2013-12-28 14:29:44 -07:00
Richard Linden
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
simon_linden
95037bdefe
MAINT-3336 : double calls to deleteAndClear() in LLAvatarAppearance destructor
2013-10-21 15:10:05 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Nyx Linden
08bd67c0dd
SH-4059 FIX other's hover parameters affects your avatar's setting
...
Added an additional sanity check to make sure that other avatars don't
affect your wearables.
2013-04-04 11:38:23 -04:00
Nyx Linden
b724791c2a
SH-4050 FIX camera goes below ground when avatar offset set to 0
...
Added a constraint to ensure that the avatar's height (with offset)
does not go below 0.1 meters. Camera was getting confused since the avatar's
effective height was negative.
Note the avatar is mostly underground/contorted even at 0.1 meters, but
most users setting values this low will be making ultra-tinies and would
be hiding the avatar mesh. Camera stays above ground when height is at 0.1.
2013-04-03 18:59:50 -04:00
prep
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
Nyx Linden
d1c1445193
SH-3909 Support avatar height offset
...
Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.
Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
2013-02-28 17:25:37 -05:00
Nyx Linden
438ceeb008
BUILDFIX: merge cleanup
...
A couple of merge issues that caused the resulting code to not build.
2013-01-25 17:58:11 -05:00
Ansariel
81d254ddc8
FIRE-11915: Fix variable redefinition; Found by Filomena Firelyte
2013-10-22 19:44:42 +02:00
Cinders
c32f9976a9
FIRE-11867: Avoid unnecessary type casting, both implicit or explicit - spotted by Filomena Firelyte
2013-10-13 12:31:50 -06:00
Nicky
91e26c225b
More memory leak prevention.
2013-10-09 11:42:22 +02:00
Ansariel
992118ffc9
Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak
2013-08-10 01:15:44 +02:00
Cinders
0723683e83
Added Karl Stiefvater's mesh deformer, patch contributed by Inworldz LLC, updated for post-SSA Firestorm
...
*Only OpenSim enabled at this point
2013-07-11 13:31:12 -06:00
Ansariel
548f139cd5
Fix RLVa merge issue
2013-07-11 12:46:37 +02:00
Kitty Barnett
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
Kitty Barnett
be7c5c2cb9
Merged with viewer-sunshine tip (Revision 230637f9ff30)
...
--HG--
branch : RLVa
2013-03-05 23:22:31 +01:00
Kitty Barnett
d74b2985a5
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-03 13:13:22 +01:00
Kitty Barnett
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
Kitty Barnett
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
Brad Payne (Vir Linden)
ee2bc008ea
renamed a confusingly-named field
2012-11-05 18:02:03 -05:00
Brad Payne (Vir Linden)
22f53c8558
additional debugging info, including tracking where visual params live
2012-10-15 18:41:55 -04:00
Don Kjer
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
Don Kjer
5bb8962c4e
Merge sunshine -> sunshine-experimental
2012-09-13 22:14:53 +00:00
Don Kjer
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
Don Kjer
929b7e0295
Instantiated bare-bones LLBakingAvatar concrete class (derived from LLAvatarAppearance). Moved some LLCharacter funcionality from LLVOAvatar to LLAvatarAppearance.
2012-09-13 03:30:17 +00:00
Nyx Linden
c34329fa4c
SH-3347 create demo of back end texture baking service
...
First link of the back-end service with some LLAppearance code.
2012-09-12 21:35:25 +00:00
Nyx (Neal Orman)
f1d6052e36
SH-3264 Moved over a few more items to llappearance
...
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
Don Kjer
e1580128ab
Fixed crashes on login. Moved most of the remaining character/skeleton generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint.
2012-09-09 12:12:19 +00:00
Nyx (Neal Orman)
77b33d9623
SH-3264 Porting over the XML loading of the avatar structure to llappearance
...
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
2012-09-07 23:17:34 -04:00
Don Kjer
2e933100bb
Merge
2012-09-06 03:04:10 +00:00
Don Kjer
85d0bcc063
Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-06 02:53:55 +00:00
Nyx (Neal Orman)
b146490e1b
SH-3264 Worked to move over mBakedTextureDatas from LLVOAvatar to LLAvatarAppearance.
...
Appear to have been able to move over the parts that are common to both the backend and the viewer
into LLAvatarAppearance.
2012-09-05 17:46:11 -04:00
Don Kjer
41301004e1
Cleanup actions from code review of llappearance with nyx
2012-09-04 22:49:26 +00:00
Don Kjer
21c364c4d4
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
2012-09-03 09:10:24 +00:00
Don Kjer
0c7623f628
Cleanup of llappearance refactor file definition order for easier diff'ing
2012-09-03 08:37:58 +00:00
Don Kjer
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00