* Cleaned namespaces of entire solution. OpenSim directories now correspond with namespaces.

52 files changed, 178 insertions, 175 deletions

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 3643088..becf7ba 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,6 +37,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
+
 //using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 1e30a7a..1781ef8 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -33,7 +33,7 @@ using System.Text.RegularExpressions;
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Communications;
 
 namespace OpenSim.Region.Communications.Local
 {
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 29de8fd..2a66edc 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -29,7 +29,6 @@ using System;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.UserManagement;
 
 namespace OpenSim.Region.Communications.Local
 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 56b0e8c..643d15b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -35,6 +35,7 @@ using libsecondlife;
 using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 
 namespace OpenSim.Region.Communications.OGS1
 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index f3b50ae..ba23216 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -38,6 +38,7 @@ using libsecondlife;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework.Communications;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 20ba27c..8020713 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Xml;
 using libsecondlife;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
index 8f580fc..9f19b43 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
@@ -29,7 +29,7 @@
 using System.Xml;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.DataSnapshot
+namespace OpenSim.Region.DataSnapshot.Interfaces
 {
     public interface IDataSnapshotProvider
     {
@@ -41,4 +41,4 @@ namespace OpenSim.Region.DataSnapshot
 
         Scene GetParentScene { get; }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 67abccd..6198e1c 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -33,6 +33,7 @@ using System.Xml;
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.World.Land;
 using OpenSim.Region.Environment.Scenes;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index d48ecfd..c295902 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -28,6 +28,7 @@
 using System.Reflection;
 using System.Xml;
 using log4net;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index e0ea94f..3f8b9ff 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
 using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
 using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
 using OpenSim.Region.Environment.Scenes;
+
 //TODO: Why do we reference InstantMessageModule here?
 
 namespace OpenSim.Region.Environment
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index f8f6ec2..2112f91 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -34,11 +34,11 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Capabilities;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
index 1527f1e..feb716e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
@@ -33,11 +33,11 @@ using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Capabilities;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice
 {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
index 95d22f0..b717d59 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
@@ -1,5 +1,4 @@
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Modules.Communications.Interregion;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.Grid.Interregion
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
index 651ed60..2ca4df9 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
@@ -6,10 +6,9 @@ using System.Runtime.Remoting.Channels.Tcp;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.Grid.Interregion;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Communications.Interregion
+namespace OpenSim.Region.Environment.Modules.Grid.Interregion
 {
     public class InterregionModule : IInterregionModule, IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
index 77a418f..40568e7 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
     internal interface IFileSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
index e1721ff..331b460 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
     public interface IRegionSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
index 40e1771..0d69553 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
@@ -32,7 +32,7 @@ using System.Text;
 using System.Xml;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
     internal class SerialiseObjects : IFileSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
index dacdbc8..bd85264 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
@@ -29,7 +29,7 @@ using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
     internal class SerialiseTerrain : IFileSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index 75fc428..4406e17 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.IO;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.ExportSerialiser;
 using OpenSim.Region.Environment.Modules.Framework;
 using OpenSim.Region.Environment.Scenes;
 
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 85c4cdd..47ce258 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.World.Sun
 {
     public class SunModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index 32e45b7..4b22700 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.World.TreePopulator
 {
     /// <summary>
     /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later.
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 60d6293..3113831 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 using Image=System.Drawing.Image;
 using Timer=System.Timers.Timer;
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 769817e..002fc5d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -29,7 +29,7 @@ using System;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Scenes
 {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
index 43049fc..a06e222 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
@@ -32,7 +32,7 @@ using System.Reflection;
 using log4net;
 using Microsoft.CSharp;
 
-namespace OpenSim.Region.ExtensionsScriptModule.CSharp
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.CSharp
 {
     public class CSharpScriptEngine : IScriptCompiler
     {
@@ -104,4 +104,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp
             return LoadDotNetScript(csharpProvider, filename);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index 1b0b6b7..dfe9336 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.CSharp.Examples
 {
     public class LSLExportScript : IScript
     {
@@ -72,4 +72,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
             }*/
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
index 52afe3f..0c3d50e 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
@@ -32,7 +32,7 @@ using System.Reflection;
 using log4net;
 using Microsoft.JScript;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JScript
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JScript
 {
     public class JScriptEngine : IScriptCompiler
     {
@@ -104,4 +104,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JScript
             return LoadDotNetScript(jscriptProvider, filename);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs
index 41f9da5..b6a0046 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs
@@ -26,9 +26,9 @@
  */
 
 using System.Collections.Generic;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class ClassInstance : Object
     {
@@ -40,4 +40,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
index 97a4a6b..d1cacd3 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
@@ -28,10 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class ClassRecord
     {
@@ -645,4 +645,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs
index 068fdd7..6507328 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class Heap
     {
@@ -37,4 +37,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs
index a1d977e..f5ffc6f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     partial class Thread
     {
@@ -616,4 +616,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index efd01e9..7da2012 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -27,7 +27,7 @@
 
 using System;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     partial class Thread
     {
@@ -101,4 +101,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs
index e6ec7ba..3ae7b91 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     partial class Thread
     {
@@ -33,4 +33,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs
index bc08af3..2dd711f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs
@@ -26,10 +26,10 @@
  */
 
 using System;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     partial class Thread
     {
@@ -129,4 +129,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs
index 53fc68f..9d912c4 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class MainMemory
     {
@@ -38,4 +38,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             HeapArea = new Heap();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs
index 0d051f1..b482e72 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class MethodMemory
     {
@@ -41,4 +41,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             MethodBuffer = new byte[20000];
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs
index 3d51558..de89a2a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class Object
     {
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs
index 69c5fc4..31fa08d 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public enum OpCode : byte
     {
@@ -76,4 +76,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
         getstatic = 178,
         putstatic = 179
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs
index 0d06194..eedcb41 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class Stack
     {
@@ -37,4 +37,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs
index cac1606..5d9c75b 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs
@@ -26,9 +26,9 @@
  */
 
 using System.Collections.Generic;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public class StackFrame
     {
@@ -43,4 +43,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             LocalVariables = new BaseType[20];
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs
index 1f5044b..3e9d0f4 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs
@@ -26,10 +26,10 @@
  */
 
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
     public partial class Thread
     {
@@ -108,4 +108,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
             return m_Interpreter.Excute();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs
index ec61dfe..8b6f89c 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine
 {
     public class JavaEngine : IScriptCompiler
     {
@@ -48,4 +48,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
             return returns;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
index f5a8b2e..017b38b 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
@@ -31,9 +31,9 @@ using System.Diagnostics;
 using System.IO;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine
 {
     public class JVMScript : IScript
     {
@@ -163,4 +163,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs
index ff27784..1ef0ff4 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
 {
     public class ArrayReference : BaseType
     {
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
index 15f13f8..829a18c 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
@@ -27,9 +27,9 @@
 
 using System;
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
 {
     public class BaseType : Object
     {
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs
index ac36ef2..bbcde5c 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
 {
     public class ObjectReference : BaseType
     {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
index 772c286..e732f33 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
     public class Byte : BaseType
     {
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
index d488222..e066454 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
     public class Char : BaseType
     {
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
index f29775f..5d60f65 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
     public class Float : BaseType
     {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
index f25320d..24ee850 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
     public class Int : BaseType
     {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 8c11f7a..48ebf86 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -31,9 +31,9 @@ using log4net;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ExtensionsScriptModule.CSharp;
-using OpenSim.Region.ExtensionsScriptModule.JScript;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine;
+using OpenSim.Region.ExtensionsScriptModule.Engines.CSharp;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JScript;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine;
 
 namespace OpenSim.Region.ExtensionsScriptModule
 {
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index 50a3b4e..6cca36d 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -6,7 +6,7 @@ using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.ExportSerialiser;
+using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Scenes;
 using PumaCode.SvnDotNet.AprSharp;
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 95acd23..9b541c5 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -217,52 +217,52 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llRound(f);
         }
 
-        public double llVecMag(LSL_Types.Vector3 v)
+        public double llVecMag(vector v)
         {
             return m_LSL_Functions.llVecMag(v);
         }
 
-        public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v)
+        public vector llVecNorm(vector v)
         {
             return m_LSL_Functions.llVecNorm(v);
         }
 
-        public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b)
+        public double llVecDist(vector a, vector b)
         {
             return m_LSL_Functions.llVecDist(a, b);
         }
 
-        public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r)
+        public vector llRot2Euler(rotation r)
         {
             return m_LSL_Functions.llRot2Euler(r);
         }
 
-        public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v)
+        public rotation llEuler2Rot(vector v)
         {
             return m_LSL_Functions.llEuler2Rot(v);
         }
 
-        public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up)
+        public rotation llAxes2Rot(vector fwd, vector left, vector up)
         {
             return m_LSL_Functions.llAxes2Rot(fwd, left, up);
         }
 
-        public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)
+        public vector llRot2Fwd(rotation r)
         {
             return m_LSL_Functions.llRot2Fwd(r);
         }
 
-        public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r)
+        public vector llRot2Left(rotation r)
         {
             return m_LSL_Functions.llRot2Left(r);
         }
 
-        public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r)
+        public vector llRot2Up(rotation r)
         {
             return m_LSL_Functions.llRot2Up(r);
         }
 
-        public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end)
+        public rotation llRotBetween(vector start, vector end)
         {
             return m_LSL_Functions.llRotBetween(start, end);
         }
@@ -340,22 +340,22 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llDetectedType(number);
         }
 
-        public LSL_Types.Vector3 llDetectedPos(int number)
+        public vector llDetectedPos(int number)
         {
             return m_LSL_Functions.llDetectedPos(number);
         }
 
-        public LSL_Types.Vector3 llDetectedVel(int number)
+        public vector llDetectedVel(int number)
         {
             return m_LSL_Functions.llDetectedVel(number);
         }
 
-        public LSL_Types.Vector3 llDetectedGrab(int number)
+        public vector llDetectedGrab(int number)
         {
             return m_LSL_Functions.llDetectedGrab(number);
         }
 
-        public LSL_Types.Quaternion llDetectedRot(int number)
+        public rotation llDetectedRot(int number)
         {
             return m_LSL_Functions.llDetectedRot(number);
         }
@@ -378,17 +378,17 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llDie();
         }
 
-        public double llGround(LSL_Types.Vector3 offset)
+        public double llGround(vector offset)
         {
             return m_LSL_Functions.llGround(offset);
         }
 
-        public double llCloud(LSL_Types.Vector3 offset)
+        public double llCloud(vector offset)
         {
             return m_LSL_Functions.llCloud(offset);
         }
 
-        public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset)
+        public vector llWind(vector offset)
         {
             return m_LSL_Functions.llWind(offset);
         }
@@ -403,17 +403,17 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetStatus(status);
         }
 
-        public void llSetScale(LSL_Types.Vector3 scale)
+        public void llSetScale(vector scale)
         {
             m_LSL_Functions.llSetScale(scale);
         }
 
-        public LSL_Types.Vector3 llGetScale()
+        public vector llGetScale()
         {
             return m_LSL_Functions.llGetScale();
         }
 
-        public void llSetColor(LSL_Types.Vector3 color, int face)
+        public void llSetColor(vector color, int face)
         {
             m_LSL_Functions.llSetColor(color, face);
         }
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSetAlpha(alpha, face);
         }
 
-        public LSL_Types.Vector3 llGetColor(int face)
+        public vector llGetColor(int face)
         {
             return m_LSL_Functions.llGetColor(face);
         }
@@ -461,47 +461,47 @@ namespace OpenSim.Region.ScriptEngine.Common
         //
         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
         //
-        public void llSetPos(LSL_Types.Vector3 pos)
+        public void llSetPos(vector pos)
         {
             m_LSL_Functions.llSetPos(pos);
         }
 
-        public LSL_Types.Vector3 llGetPos()
+        public vector llGetPos()
         {
             return m_LSL_Functions.llGetPos();
         }
 
-        public LSL_Types.Vector3 llGetLocalPos()
+        public vector llGetLocalPos()
         {
             return m_LSL_Functions.llGetLocalPos();
         }
 
-        public void llSetRot(LSL_Types.Quaternion rot)
+        public void llSetRot(rotation rot)
         {
             m_LSL_Functions.llSetRot(rot);
         }
 
-        public LSL_Types.Quaternion llGetRot()
+        public rotation llGetRot()
         {
             return m_LSL_Functions.llGetRot();
         }
 
-        public LSL_Types.Quaternion llGetLocalRot()
+        public rotation llGetLocalRot()
         {
             return m_LSL_Functions.llGetLocalRot();
         }
 
-        public void llSetForce(LSL_Types.Vector3 force, int local)
+        public void llSetForce(vector force, int local)
         {
             m_LSL_Functions.llSetForce(force, local);
         }
 
-        public LSL_Types.Vector3 llGetForce()
+        public vector llGetForce()
         {
             return m_LSL_Functions.llGetForce();
         }
 
-        public int llTarget(LSL_Types.Vector3 position, double range)
+        public int llTarget(vector position, double range)
         {
             return m_LSL_Functions.llTarget(position, range);
         }
@@ -511,7 +511,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llTargetRemove(number);
         }
 
-        public int llRotTarget(LSL_Types.Quaternion rot, double error)
+        public int llRotTarget(rotation rot, double error)
         {
             return m_LSL_Functions.llRotTarget(rot, error);
         }
@@ -521,7 +521,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llRotTargetRemove(number);
         }
 
-        public void llMoveToTarget(LSL_Types.Vector3 target, double tau)
+        public void llMoveToTarget(vector target, double tau)
         {
             m_LSL_Functions.llMoveToTarget(target, tau);
         }
@@ -531,7 +531,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llStopMoveToTarget();
         }
 
-        public void llApplyImpulse(LSL_Types.Vector3 force, int local)
+        public void llApplyImpulse(vector force, int local)
         {
             m_LSL_Functions.llApplyImpulse(force, local);
         }
@@ -539,37 +539,37 @@ namespace OpenSim.Region.ScriptEngine.Common
         //
         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
         //
-        public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local)
+        public void llApplyRotationalImpulse(vector force, int local)
         {
             m_LSL_Functions.llApplyRotationalImpulse(force, local);
         }
 
-        public void llSetTorque(LSL_Types.Vector3 torque, int local)
+        public void llSetTorque(vector torque, int local)
         {
             m_LSL_Functions.llSetTorque(torque, local);
         }
 
-        public LSL_Types.Vector3 llGetTorque()
+        public vector llGetTorque()
         {
             return m_LSL_Functions.llGetTorque();
         }
 
-        public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local)
+        public void llSetForceAndTorque(vector force, vector torque, int local)
         {
             m_LSL_Functions.llSetForceAndTorque(force, torque, local);
         }
 
-        public LSL_Types.Vector3 llGetVel()
+        public vector llGetVel()
         {
             return m_LSL_Functions.llGetVel();
         }
 
-        public LSL_Types.Vector3 llGetAccel()
+        public vector llGetAccel()
         {
             return m_LSL_Functions.llGetAccel();
         }
 
-        public LSL_Types.Vector3 llGetOmega()
+        public vector llGetOmega()
         {
             return m_LSL_Functions.llGetOmega();
         }
@@ -697,12 +697,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llMakeFire();
         }
 
-        public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param)
+        public void llRezObject(string inventory, vector pos, rotation rot, int param)
         {
             m_LSL_Functions.llRezObject(inventory, pos, rot, param);
         }
 
-        public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)
+        public void llLookAt(vector target, double strength, double damping)
         {
             m_LSL_Functions.llLookAt(target, strength, damping);
         }
@@ -815,7 +815,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSoundPreload();
         }
 
-        public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping)
+        public void llRotLookAt(rotation target, double strength, double damping)
         {
             m_LSL_Functions.llRotLookAt(target, strength, damping);
         }
@@ -848,7 +848,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llStopPointAt();
         }
 
-        public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain)
+        public void llTargetOmega(vector axis, double spinrate, double gain)
         {
             m_LSL_Functions.llTargetOmega(axis, spinrate, gain);
         }
@@ -858,7 +858,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetStartParameter();
         }
 
-        public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos)
+        public void llGodLikeRezObject(string inventory, vector pos)
         {
             m_LSL_Functions.llGodLikeRezObject(inventory, pos);
         }
@@ -883,7 +883,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetLinkNumber();
         }
 
-        public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face)
+        public void llSetLinkColor(int linknumber, vector color, int face)
         {
             m_LSL_Functions.llSetLinkColor(linknumber, color, face);
         }
@@ -946,12 +946,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llRemoveInventory(item);
         }
 
-        public void llSetText(string text, LSL_Types.Vector3 color, double alpha)
+        public void llSetText(string text, vector color, double alpha)
         {
             m_LSL_Functions.llSetText(text, color, alpha);
         }
 
-        public double llWater(LSL_Types.Vector3 offset)
+        public double llWater(vector offset)
         {
             return m_LSL_Functions.llWater(offset);
         }
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llMessageLinked(linknum, num, str, id);
         }
 
-        public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local)
+        public void llPushObject(string target, vector impulse, vector ang_impulse, int local)
         {
             m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local);
         }
@@ -1034,17 +1034,17 @@ namespace OpenSim.Region.ScriptEngine.Common
         //
         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
         //
-        public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle)
+        public rotation llAxisAngle2Rot(vector axis, double angle)
         {
             return m_LSL_Functions.llAxisAngle2Rot(axis, angle);
         }
 
-        public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot)
+        public vector llRot2Axis(rotation rot)
         {
             return m_LSL_Functions.llRot2Axis(rot);
         }
 
-        public double llRot2Angle(LSL_Types.Quaternion rot)
+        public double llRot2Angle(rotation rot)
         {
             return m_LSL_Functions.llRot2Angle(rot);
         }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llAsin(val);
         }
 
-        public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b)
+        public double llAngleBetween(rotation a, rotation b)
         {
             return m_LSL_Functions.llAngleBetween(a, b);
         }
@@ -1074,17 +1074,17 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llAllowInventoryDrop(add);
         }
 
-        public LSL_Types.Vector3 llGetSunDirection()
+        public vector llGetSunDirection()
         {
             return m_LSL_Functions.llGetSunDirection();
         }
 
-        public LSL_Types.Vector3 llGetTextureOffset(int face)
+        public vector llGetTextureOffset(int face)
         {
             return m_LSL_Functions.llGetTextureOffset(face);
         }
 
-        public LSL_Types.Vector3 llGetTextureScale(int side)
+        public vector llGetTextureScale(int side)
         {
             return m_LSL_Functions.llGetTextureScale(side);
         }
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetOwnerKey(id);
         }
 
-        public LSL_Types.Vector3 llGetCenterOfMass()
+        public vector llGetCenterOfMass()
         {
             return m_LSL_Functions.llGetCenterOfMass();
         }
@@ -1142,12 +1142,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llList2Key(src, index);
         }
 
-        public LSL_Types.Vector3 llList2Vector(LSL_Types.list src, int index)
+        public vector llList2Vector(LSL_Types.list src, int index)
         {
             return m_LSL_Functions.llList2Vector(src, index);
         }
 
-        public LSL_Types.Quaternion llList2Rot(LSL_Types.list src, int index)
+        public rotation llList2Rot(LSL_Types.list src, int index)
         {
             return m_LSL_Functions.llList2Rot(src, index);
         }
@@ -1187,7 +1187,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llList2ListStrided(src, start, end, stride);
         }
 
-        public LSL_Types.Vector3 llGetRegionCorner()
+        public vector llGetRegionCorner()
         {
             return m_LSL_Functions.llGetRegionCorner();
         }
@@ -1217,7 +1217,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetDate();
         }
 
-        public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir)
+        public int llEdgeOfWorld(vector pos, vector dir)
         {
             return m_LSL_Functions.llEdgeOfWorld(pos, dir);
         }
@@ -1255,7 +1255,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate);
         }
 
-        public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west)
+        public void llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west)
         {
             m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west);
         }
@@ -1275,7 +1275,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llOverMyLand(id);
         }
 
-        public string llGetLandOwnerAt(LSL_Types.Vector3 pos)
+        public string llGetLandOwnerAt(vector pos)
         {
             return m_LSL_Functions.llGetLandOwnerAt(pos);
         }
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetNotecardLine(name, line);
         }
 
-        public LSL_Types.Vector3 llGetAgentSize(string id)
+        public vector llGetAgentSize(string id)
         {
             return m_LSL_Functions.llGetAgentSize(id);
         }
@@ -1300,17 +1300,17 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llUnSit(id);
         }
 
-        public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset)
+        public vector llGroundSlope(vector offset)
         {
             return m_LSL_Functions.llGroundSlope(offset);
         }
 
-        public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset)
+        public vector llGroundNormal(vector offset)
         {
             return m_LSL_Functions.llGroundNormal(offset);
         }
 
-        public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset)
+        public vector llGroundContour(vector offset)
         {
             return m_LSL_Functions.llGroundContour(offset);
         }
@@ -1368,12 +1368,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSetVehicledoubleParam(param, value);
         }
 
-        public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec)
+        public void llSetVehicleVectorParam(int param, vector vec)
         {
             m_LSL_Functions.llSetVehicleVectorParam(param, vec);
         }
 
-        public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot)
+        public void llSetVehicleRotationParam(int param, rotation rot)
         {
             m_LSL_Functions.llSetVehicleRotationParam(param, rot);
         }
@@ -1388,7 +1388,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llRemoveVehicleFlags(flags);
         }
 
-        public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot)
+        public void llSitTarget(vector offset, rotation rot)
         {
             m_LSL_Functions.llSitTarget(offset, rot);
         }
@@ -1413,12 +1413,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSetSitText(text);
         }
 
-        public void llSetCameraEyeOffset(LSL_Types.Vector3 offset)
+        public void llSetCameraEyeOffset(vector offset)
         {
             m_LSL_Functions.llSetCameraEyeOffset(offset);
         }
 
-        public void llSetCameraAtOffset(LSL_Types.Vector3 offset)
+        public void llSetCameraAtOffset(vector offset)
         {
             m_LSL_Functions.llSetCameraAtOffset(offset);
         }
@@ -1428,7 +1428,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llDumpList2String(src, seperator);
         }
 
-        public int llScriptDanger(LSL_Types.Vector3 pos)
+        public int llScriptDanger(vector pos)
         {
             return m_LSL_Functions.llScriptDanger(pos);
         }
@@ -1545,12 +1545,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSetParcelMusicURL(url);
         }
 
-        public LSL_Types.Vector3 llGetRootPosition()
+        public vector llGetRootPosition()
         {
             return m_LSL_Functions.llGetRootPosition();
         }
 
-        public LSL_Types.Quaternion llGetRootRotation()
+        public rotation llGetRootRotation()
         {
             return m_LSL_Functions.llGetRootRotation();
         }
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetBoundingBox(obj);
         }
 
-        public LSL_Types.Vector3 llGetGeometricCenter()
+        public vector llGetGeometricCenter()
         {
             return m_LSL_Functions.llGetGeometricCenter();
         }
@@ -1628,7 +1628,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetSimulatorHostname();
         }
 
-        public void llSetLocalRot(LSL_Types.Quaternion rot)
+        public void llSetLocalRot(rotation rot)
         {
             m_LSL_Functions.llSetLocalRot(rot);
         }
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers);
         }
 
-        public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param)
+        public void llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, int param)
         {
             m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param);
         }
@@ -1726,12 +1726,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons);
         }
 
-        public LSL_Types.Vector3 llGetCameraPos()
+        public vector llGetCameraPos()
         {
             return m_LSL_Functions.llGetCameraPos();
         }
 
-        public LSL_Types.Quaternion llGetCameraRot()
+        public rotation llGetCameraRot()
         {
             return m_LSL_Functions.llGetCameraRot();
         }
@@ -1756,7 +1756,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llUnescapeURL(url);
         }
 
-        public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at)
+        public void llMapDestination(string simname, vector pos, vector look_at)
         {
             m_LSL_Functions.llMapDestination(simname, pos, look_at);
         }
@@ -1796,7 +1796,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llGetUnixTime();
         }
 
-        public int llGetParcelFlags(LSL_Types.Vector3 pos)
+        public int llGetParcelFlags(vector pos)
         {
             return m_LSL_Functions.llGetParcelFlags(pos);
         }
@@ -1826,12 +1826,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.llResetLandPassList();
         }
 
-        public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide)
+        public int llGetParcelPrimCount(vector pos, int category, int sim_wide)
         {
             return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide);
         }
 
-        public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos)
+        public LSL_Types.list llGetParcelPrimOwners(vector pos)
         {
             return m_LSL_Functions.llGetParcelPrimOwners(pos);
         }
@@ -1844,12 +1844,12 @@ namespace OpenSim.Region.ScriptEngine.Common
         //
         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
         //
-        public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide)
+        public int llGetParcelMaxPrims(vector pos, int sim_wide)
         {
             return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide);
         }
 
-        public LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param)
+        public LSL_Types.list llGetParcelDetails(vector pos, LSL_Types.list param)
         {
             return m_LSL_Functions.llGetParcelDetails(pos, param);
         }
@@ -2387,7 +2387,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         public const int OBJECT_CREATOR = 8;
 
         // Can not be public const?
-        public LSL_Types.Vector3 ZERO_VECTOR = new LSL_Types.Vector3(0.0, 0.0, 0.0);
-        public LSL_Types.Quaternion ZERO_ROTATION = new LSL_Types.Quaternion(0.0, 0, 0.0, 1.0);
+        public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
+        public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0);
     }
 }