From bb21d0e11ab59de53ded9d0a3c8fad686f331b42 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Thu, 20 Dec 2007 19:20:33 +0000 Subject: [PATCH] Applying patch #68 from A_Biondi, allows ImportCommand to work on land where you only have group build permissions git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1538 52acb1d6-8a22-11de-b505-999d5b087335 --- .../TestClient/Commands/Prims/ImportCommand.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs index a7fe32fd..24cfc97a 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs @@ -44,17 +44,18 @@ namespace libsecondlife.TestClient public ImportCommand(TestClient testClient) { Name = "import"; - Description = "Import prims from an exported xml file. Usage: import inputfile.xml"; + Description = "Import prims from an exported xml file. Usage: import inputfile.xml [usegroup]"; testClient.Objects.OnNewPrim += new ObjectManager.NewPrimCallback(Objects_OnNewPrim); } public override string Execute(string[] args, LLUUID fromAgentID) { - if (args.Length != 1) - return "Usage: import inputfile.xml"; + if (args.Length < 1) + return "Usage: import inputfile.xml [usegroup]"; string filename = args[0]; + LLUUID GroupID = (args.Length > 1) ? Client.GroupID : LLUUID.Zero; string xml; List prims; @@ -105,7 +106,7 @@ namespace libsecondlife.TestClient LLQuaternion rootRotation = linkset.RootPrim.Rotation; linkset.RootPrim.Rotation = LLQuaternion.Identity; - Client.Objects.AddPrim(Client.Network.CurrentSim, linkset.RootPrim.Data, LLUUID.Zero, + Client.Objects.AddPrim(Client.Network.CurrentSim, linkset.RootPrim.Data, GroupID, linkset.RootPrim.Position, linkset.RootPrim.Scale, linkset.RootPrim.Rotation); if (!primDone.WaitOne(10000, false)) @@ -119,7 +120,7 @@ namespace libsecondlife.TestClient currentPrim = prim; currentPosition = prim.Position + linkset.RootPrim.Position; - Client.Objects.AddPrim(Client.Network.CurrentSim, prim.Data, LLUUID.Zero, currentPosition, + Client.Objects.AddPrim(Client.Network.CurrentSim, prim.Data, GroupID, currentPosition, prim.Scale, prim.Rotation); if (!primDone.WaitOne(10000, false))