Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applying patch #68 from A_Biondi, allows ImportCommand to work on land where you only have group build permissions

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1538 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2007-12-20 19:20:33 +00:00
parent dd9d90aed2
commit bb21d0e11a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs
View File

@@ -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<Primitive> 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))