diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 16 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 3 |
2 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 56fcc15..a3ea499 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 | { |
@@ -1481,4 +1473,4 @@ namespace OpenSim.Framework | |||
1481 | SKIRT_SKIRT_BLUE = 217 | 1473 | SKIRT_SKIRT_BLUE = 217 |
1482 | } | 1474 | } |
1483 | } | 1475 | } |
1484 | } | 1476 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 4f0af06..02be141 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -785,7 +785,8 @@ namespace OpenSim.Framework.Communications | |||
785 | } | 785 | } |
786 | catch (Exception e) | 786 | catch (Exception e) |
787 | { | 787 | { |
788 | m_log.ErrorFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Name, e.ToString()); | 788 | m_log.ErrorFormat( |
789 | "[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user, plugin.Name, e); | ||
789 | } | 790 | } |
790 | } | 791 | } |
791 | 792 | ||