From e6ca5e12be7bd7554b241683eafa63cc613de889 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Fri, 13 May 2011 12:07:30 +0000 Subject: [PATCH] LIBOMV-901: Fix import to match changes in Primitive.cs git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3518 52acb1d6-8a22-11de-b505-999d5b087335 --- .../Commands/Prims/ImportCommand.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs b/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs index 76608fbe..257b0663 100644 --- a/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs @@ -202,20 +202,30 @@ namespace OpenMetaverse.TestClient Client.Objects.SetPosition(e.Simulator, prim.LocalID, currentPosition); Client.Objects.SetTextures(e.Simulator, prim.LocalID, currentPrim.Textures); - if (currentPrim.Light.Intensity > 0) { + if (currentPrim.Light != null && currentPrim.Light.Intensity > 0) + { Client.Objects.SetLight(e.Simulator, prim.LocalID, currentPrim.Light); } - Client.Objects.SetFlexible(e.Simulator, prim.LocalID, currentPrim.Flexible); - - if (currentPrim.Sculpt.SculptTexture != UUID.Zero) { + if (currentPrim.Flexible != null) + { + Client.Objects.SetFlexible(e.Simulator, prim.LocalID, currentPrim.Flexible); + } + + if (currentPrim.Sculpt != null && currentPrim.Sculpt.SculptTexture != UUID.Zero) + { Client.Objects.SetSculpt(e.Simulator, prim.LocalID, currentPrim.Sculpt); } - if (!String.IsNullOrEmpty(currentPrim.Properties.Name)) + if (currentPrim.Properties!= null && !String.IsNullOrEmpty(currentPrim.Properties.Name)) + { Client.Objects.SetName(e.Simulator, prim.LocalID, currentPrim.Properties.Name); - if (!String.IsNullOrEmpty(currentPrim.Properties.Description)) + } + + if (currentPrim.Properties != null && !String.IsNullOrEmpty(currentPrim.Properties.Description)) + { Client.Objects.SetDescription(e.Simulator, prim.LocalID, currentPrim.Properties.Description); + } primsCreated.Add(prim); primDone.Set();