diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Tools | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/Export/OpenSimExport.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/PhysicsBot.cs | 8 |
3 files changed, 8 insertions, 8 deletions
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 | |||
63 | XmlConfigurator.Configure(); | 63 | XmlConfigurator.Configure(); |
64 | 64 | ||
65 | OpenSimExport export = new OpenSimExport(InitConfig(args)); | 65 | OpenSimExport export = new OpenSimExport(InitConfig(args)); |
66 | RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false); | 66 | RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.Xml",false); |
67 | 67 | ||
68 | Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); | 68 | Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); |
69 | foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) | 69 | foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) |
@@ -109,4 +109,4 @@ namespace OpenSimExport | |||
109 | return config; | 109 | return config; |
110 | } | 110 | } |
111 | } | 111 | } |
112 | } \ No newline at end of file | 112 | } |
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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -197,7 +197,7 @@ namespace pCampBot | |||
197 | break; | 197 | break; |
198 | case "addbots": | 198 | case "addbots": |
199 | int newbots; | 199 | int newbots; |
200 | Helpers.TryParse(cmdparams[0], out newbots); | 200 | Int32.TryParse(cmdparams[0], out newbots); |
201 | 201 | ||
202 | if (newbots > 0) | 202 | if (newbots > 0) |
203 | addbots(newbots); | 203 | 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; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Threading; | 30 | using System.Threading; |
31 | using System.Timers; | 31 | using System.Timers; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
@@ -55,7 +55,7 @@ namespace pCampBot | |||
55 | protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here | 55 | protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here |
56 | 56 | ||
57 | //New instance of a SecondLife client | 57 | //New instance of a SecondLife client |
58 | public SecondLife client = new SecondLife(); | 58 | public GridClient client = new GridClient(); |
59 | 59 | ||
60 | protected string[] talkarray; | 60 | protected string[] talkarray; |
61 | /// <summary> | 61 | /// <summary> |
@@ -87,8 +87,8 @@ namespace pCampBot | |||
87 | client.Self.Movement.AlwaysRun = false; | 87 | client.Self.Movement.AlwaysRun = false; |
88 | } | 88 | } |
89 | 89 | ||
90 | // TODO: unused: LLVector3 pos = client.Self.SimPosition; | 90 | // TODO: unused: Vector3 pos = client.Self.SimPosition; |
91 | LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); | 91 | Vector3 newpos = new Vector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); |
92 | client.Self.Movement.TurnToward(newpos); | 92 | client.Self.Movement.TurnToward(newpos); |
93 | 93 | ||
94 | for (int i = 0; i < 2000; i++) | 94 | for (int i = 0; i < 2000; i++) |