ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix http://opensimulator.org/mantis/view.php?id=4224

Browse Source 
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache.  However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
This commit is contained in:
Justin Clark-Casey (justincc)
2010-02-12 21:32:03 +00:00
parent 1d4d6c821a
commit 802a969267
13 changed files with 82 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -69,9 +69,7 @@ namespace OpenSim.Framework
private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
public readonly static int VISUALPARAM_COUNT = 218;
public readonly static int VISUALPARAM_COUNT = 218;
protected UUID m_owner;
@@ -346,11 +344,7 @@ namespace OpenSim.Framework
}
*/
public AvatarAppearance()
: this(UUID.Zero)
{
}
public AvatarAppearance() : this(UUID.Zero) {}
public AvatarAppearance(UUID owner)
{
@@ -367,10 +361,8 @@ namespace OpenSim.Framework
// This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist
SetDefaultParams(m_visualparams);
SetDefaultWearables();
m_texture = GetDefaultTexture();
m_texture = GetDefaultTexture();
}
public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams)
{
@@ -1481,4 +1473,4 @@ namespace OpenSim.Framework
SKIRT_SKIRT_BLUE = 217
}
}
}
}

3
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -785,7 +785,8 @@ namespace OpenSim.Framework.Communications
}
catch (Exception e)
{
m_log.ErrorFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Name, e.ToString());
m_log.ErrorFormat(
"[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user, plugin.Name, e);
}
}