From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- OpenSim/Tools/Export/OpenSimExport.cs | 4 ++-- OpenSim/Tools/pCampBot/BotManager.cs | 4 ++-- OpenSim/Tools/pCampBot/PhysicsBot.cs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Tools') diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs index f469d91..68d4716 100644 --- a/OpenSim/Tools/Export/OpenSimExport.cs +++ b/OpenSim/Tools/Export/OpenSimExport.cs @@ -63,7 +63,7 @@ namespace OpenSimExport XmlConfigurator.Configure(); OpenSimExport export = new OpenSimExport(InitConfig(args)); - RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false); + RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.Xml",false); Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) @@ -109,4 +109,4 @@ namespace OpenSimExport return config; } } -} \ No newline at end of file +} diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 4bdc494..8eb00c7 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Reflection; using System.Threading; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; @@ -197,7 +197,7 @@ namespace pCampBot break; case "addbots": int newbots; - Helpers.TryParse(cmdparams[0], out newbots); + Int32.TryParse(cmdparams[0], out newbots); if (newbots > 0) addbots(newbots); diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs index 49c3c78..84987b2 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs @@ -29,7 +29,7 @@ using System; using System.IO; using System.Threading; using System.Timers; -using libsecondlife; +using OpenMetaverse; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Console; @@ -55,7 +55,7 @@ namespace pCampBot protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here //New instance of a SecondLife client - public SecondLife client = new SecondLife(); + public GridClient client = new GridClient(); protected string[] talkarray; /// @@ -87,8 +87,8 @@ namespace pCampBot client.Self.Movement.AlwaysRun = false; } - // TODO: unused: LLVector3 pos = client.Self.SimPosition; - LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); + // TODO: unused: Vector3 pos = client.Self.SimPosition; + Vector3 newpos = new Vector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); client.Self.Movement.TurnToward(newpos); for (int i = 0; i < 2000; i++) -- cgit v1.1