diff options
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 5ec9283..c0e9891 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -69,9 +69,7 @@ namespace OpenSim.Framework | |||
69 | private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66"); | 69 | private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66"); |
70 | private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66"); | 70 | private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66"); |
71 | 71 | ||
72 | public readonly static int VISUALPARAM_COUNT = 218; | 72 | public readonly static int VISUALPARAM_COUNT = 218; |
73 | |||
74 | |||
75 | 73 | ||
76 | protected UUID m_owner; | 74 | protected UUID m_owner; |
77 | 75 | ||
@@ -346,11 +344,7 @@ namespace OpenSim.Framework | |||
346 | } | 344 | } |
347 | */ | 345 | */ |
348 | 346 | ||
349 | 347 | public AvatarAppearance() : this(UUID.Zero) {} | |
350 | public AvatarAppearance() | ||
351 | : this(UUID.Zero) | ||
352 | { | ||
353 | } | ||
354 | 348 | ||
355 | public AvatarAppearance(UUID owner) | 349 | public AvatarAppearance(UUID owner) |
356 | { | 350 | { |
@@ -367,10 +361,8 @@ namespace OpenSim.Framework | |||
367 | // This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist | 361 | // This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist |
368 | SetDefaultParams(m_visualparams); | 362 | SetDefaultParams(m_visualparams); |
369 | SetDefaultWearables(); | 363 | SetDefaultWearables(); |
370 | m_texture = GetDefaultTexture(); | 364 | m_texture = GetDefaultTexture(); |
371 | |||
372 | } | 365 | } |
373 | |||
374 | 366 | ||
375 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) | 367 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) |
376 | { | 368 | { |
@@ -398,11 +390,12 @@ namespace OpenSim.Framework | |||
398 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height | 390 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height |
399 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height | 391 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height |
400 | + 0.076f * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH] / 255.0f; // Neck length | 392 | + 0.076f * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH] / 255.0f; // Neck length |
401 | m_hipOffset = (0.615385f // Half of avatar | 393 | m_hipOffset = (((1.23077f // Half of avatar |
394 | + 0.516945f * (float)m_visualparams[(int)VPElement.SHAPE_HEIGHT] / 255.0f // Body height | ||
395 | + 0.3836f * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH] / 255.0f // Leg length | ||
402 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height | 396 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height |
403 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height | 397 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height |
404 | + 0.3836f * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH] / 255.0f // Leg length | 398 | ) / 2) - m_avatarHeight / 2) * 0.31f - 0.0425f; |
405 | - m_avatarHeight / 2) * 0.3f - 0.04f; | ||
406 | 399 | ||
407 | 400 | ||
408 | 401 | ||
@@ -1496,4 +1489,4 @@ namespace OpenSim.Framework | |||
1496 | SKIRT_SKIRT_BLUE = 217 | 1489 | SKIRT_SKIRT_BLUE = 217 |
1497 | } | 1490 | } |
1498 | } | 1491 | } |
1499 | } | 1492 | } \ No newline at end of file |