A slightly modified version of

http://opensimulator.org/mantis/view.php?id=4040 by jhurliman.    The patch didn't match up, so I winged it here.   My effort to manually merge the patch seems to make sense, so I'm going to commit it.
remotes/origin/0.6.7-post-fixes
Teravus Ovares (Dan Olivares) 2009-08-25 17:36:04 -04:00
parent a7917b428a
commit 5f794d3e59
3 changed files with 14 additions and 1 deletions

View File

@ -510,6 +510,13 @@ namespace OpenSim.Framework
if (te != null && te.Length > 0) if (te != null && te.Length > 0)
Texture = new Primitive.TextureEntry(te, 0, te.Length); Texture = new Primitive.TextureEntry(te, 0, te.Length);
} }
else
{
// We shouldn't be receiving appearance hashtables without a TextureEntry,
// but in case we do this will prevent a failure when saving to the database
Texture = GetDefaultTexture();
}
AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);

View File

@ -110,7 +110,12 @@ namespace OpenSim.Grid.UserServer.Modules
if (requestData.Contains("owner")) if (requestData.Contains("owner"))
{ {
AvatarAppearance appearance = new AvatarAppearance(requestData); AvatarAppearance appearance = new AvatarAppearance(requestData);
m_userDataBaseService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance);
// TODO: Sometime in the future we may have a database layer that is capable of updating appearance when
// the TextureEntry is null. When that happens, this check can be removed
if (appearance.Texture != null)
m_userDataBaseService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance);
responseData = new Hashtable(); responseData = new Hashtable();
responseData["returnString"] = "TRUE"; responseData["returnString"] = "TRUE";
} }

View File

@ -1055,6 +1055,7 @@
<Reference name="OpenSim.Grid.UserServer.Modules"/> <Reference name="OpenSim.Grid.UserServer.Modules"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="log4net.dll"/> <Reference name="log4net.dll"/>
<Reference name="Nini.dll"/> <Reference name="Nini.dll"/>