546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
58e2d58daf
SL-93 - WIP on managing pelvis fixups using new joint offset framework
2014-10-30 04:20:12 -04:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
2c0a0f4a57
MAINT-4158 cleanup
2014-09-05 15:05:51 -04:00
807f4dff74
MAINT-4158 WIP - comment change
2014-08-28 17:37:25 -04:00
2cb14c7fdc
MAINT-4158 WIP - track position overrides requested by attachments so they can be undone intelligently
2014-08-28 17:32:22 -04:00
79bb641310
MAINT-4158 WIP - fix for bug caused by multiple wearables with the same asset id
2014-08-21 14:18:35 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
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
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
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
d58e7cfbfc
SH-3455 WIP - removing bake upload code
2013-09-19 13:59:20 -04:00
82f147367f
SH-3455 WIP - removing bake upload code
2013-09-19 11:10:59 -04:00
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
95037bdefe
MAINT-3336 : double calls to deleteAndClear() in LLAvatarAppearance destructor
2013-10-21 15:10:05 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
af14317318
SH-4060 FIX avatar hover being set to minimum at seemingly random times
...
avatar hover was being temporarily set to -2.0 for the preview render, which
was triggering the minimum enforcement, even when the user's requested value
is no where near the minimum. Added a flag to disable the minimum enforcement
if we are temporarily changing the value.
2013-05-02 13:56:10 -04:00
fcb4f8265d
SH-4146 FIX petite avatars can't touch the ground
...
adjusted avatar hover limits to make sure that they are not forced to
go above the default
2013-04-29 11:49:49 -04:00
f35a229281
BUILDFIX: removing unused variables
2013-04-25 16:17:01 -04:00
d58b9ee54e
SH-4050 FIX camera goes underground if hover set low enough
...
Changing viewer limit for avatar height to match server limit, camera does not go underground.
Also clarified where we do not need avatar offset in the code, through comments
2013-04-25 14:09:42 -04:00
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
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
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
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
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
81d254ddc8
FIRE-11915: Fix variable redefinition; Found by Filomena Firelyte
2013-10-22 19:44:42 +02:00
c32f9976a9
FIRE-11867: Avoid unnecessary type casting, both implicit or explicit - spotted by Filomena Firelyte
2013-10-13 12:31:50 -06:00
91e26c225b
More memory leak prevention.
2013-10-09 11:42:22 +02:00
992118ffc9
Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak
2013-08-10 01:15:44 +02:00
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
548f139cd5
Fix RLVa merge issue
2013-07-11 12:46:37 +02:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
be7c5c2cb9
Merged with viewer-sunshine tip (Revision 230637f9ff30)
...
--HG--
branch : RLVa
2013-03-05 23:22:31 +01:00
d74b2985a5
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-03 13:13:22 +01:00
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
ee2bc008ea
renamed a confusingly-named field
2012-11-05 18:02:03 -05:00
22f53c8558
additional debugging info, including tracking where visual params live
2012-10-15 18:41:55 -04:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
5bb8962c4e
Merge sunshine -> sunshine-experimental
2012-09-13 22:14:53 +00:00
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
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
Ansariel