* Fixed a null reference exception in ObjectManager where prim Properties was null while calling .Properties.SetFamilyProperties, and a related problem in TestClient. Also fixed a null reference exception in sculpt data for ExportCommand.cs

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2403 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
2009-01-05 18:01:37 +00:00
parent e9ca2fef01
commit 3444200bc1
2 changed files with 7 additions and 1 deletions

View File

@@ -131,7 +131,8 @@ namespace OpenMetaverse.TestClient
}
}
if (prim.Sculpt.SculptTexture != UUID.Zero && !Textures.Contains(prim.Sculpt.SculptTexture)) {
if (prim.Sculpt != null && prim.Sculpt.SculptTexture != UUID.Zero && !Textures.Contains(prim.Sculpt.SculptTexture))
{
Textures.Add(prim.Sculpt.SculptTexture);
}
}
@@ -219,6 +220,7 @@ namespace OpenMetaverse.TestClient
void Objects_OnObjectPropertiesFamily(Simulator simulator, Primitive.ObjectProperties properties,
ReportType type)
{
Properties = new Primitive.ObjectProperties();
Properties.SetFamilyProperties(properties);
GotPermissions = true;
GotPermissionsEvent.Set();