aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 15:36:39 +0000
committerAdam Frisby2008-05-01 15:36:39 +0000
commita1c8aa4050b7f7a94e02dd40d8cd456f258b4e2b (patch)
treea71b99297fa2b57f7c53492fe18f48b3d3ad8827 /OpenSim
parentMoving LaunchSLClient source files so build works (2/2) (diff)
downloadopensim-SC_OLD-a1c8aa4050b7f7a94e02dd40d8cd456f258b4e2b.zip
opensim-SC_OLD-a1c8aa4050b7f7a94e02dd40d8cd456f258b4e2b.tar.gz
opensim-SC_OLD-a1c8aa4050b7f7a94e02dd40d8cd456f258b4e2b.tar.bz2
opensim-SC_OLD-a1c8aa4050b7f7a94e02dd40d8cd456f258b4e2b.tar.xz
* Cleaned namespaces of entire solution. OpenSim directories now correspond with namespaces.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
-rw-r--r--OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs11
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDArray.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs13
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTest.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDType.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/GenericAsyncResult.cs156
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs30
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs368
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs10
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs1
-rw-r--r--OpenSim/Framework/Configuration/XML/XmlConfiguration.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs5
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs6
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs1
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs1
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs2
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs8
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs8
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs8
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs8
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs6
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs176
-rw-r--r--OpenSim/Tools/Export/OpenSimExport.cs5
91 files changed, 790 insertions, 272 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index db1628c..6f82181 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.Environment.Scenes;
43[assembly : Addin] 43[assembly : Addin]
44[assembly : AddinDependency("OpenSim", "0.5")] 44[assembly : AddinDependency("OpenSim", "0.5")]
45 45
46namespace OpenSim.ApplicationPlugins.LoadRegions 46namespace OpenSim.ApplicationPlugins.RemoteController
47{ 47{
48 [Extension("/OpenSim/Startup")] 48 [Extension("/OpenSim/Startup")]
49 public class RemoteAdminPlugin : IApplicationPlugin 49 public class RemoteAdminPlugin : IApplicationPlugin
@@ -611,4 +611,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
611 { 611 {
612 } 612 }
613 } 613 }
614} 614} \ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
index e4f1dc2..15ddd16 100644
--- a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
@@ -32,7 +32,7 @@ using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate.Types
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class LLUUIDUserType: IUserType 38 public class LLUUIDUserType: IUserType
@@ -102,4 +102,4 @@ namespace OpenSim.Data.NHibernate
102 get { return new SqlType [] { NHibernateUtil.String.SqlType }; } 102 get { return new SqlType [] { NHibernateUtil.String.SqlType }; }
103 } 103 }
104 } 104 }
105} 105} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index c07744c..b6ee04d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -32,11 +32,10 @@ using System.IO;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using libsecondlife;
34using log4net; 34using log4net;
35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
38 37
39namespace OpenSim.Region.Capabilities 38namespace OpenSim.Framework.Communications.Capabilities
40{ 39{
41 public delegate void UpLoadedAsset( 40 public delegate void UpLoadedAsset(
42 string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, 41 string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder,
@@ -54,8 +53,8 @@ namespace OpenSim.Region.Capabilities
54 bool isScriptRunning, byte[] data); 53 bool isScriptRunning, byte[] data);
55 54
56 public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, 55 public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID,
57 bool fetchFolders, bool fetchItems, int sortOrder); 56 bool fetchFolders, bool fetchItems, int sortOrder);
58 57
59 /// <summary> 58 /// <summary>
60 /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that 59 /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that
61 /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want 60 /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want
@@ -397,7 +396,7 @@ namespace OpenSim.Region.Capabilities
397 /// <returns></returns> 396 /// <returns></returns>
398 public string RequestTexture(string request, string path, string param) 397 public string RequestTexture(string request, string path, string param)
399 { 398 {
400 Console.WriteLine("texture request " + request); 399 System.Console.WriteLine("texture request " + request);
401 // Needs implementing (added to remove compiler warning) 400 // Needs implementing (added to remove compiler warning)
402 return String.Empty; 401 return String.Empty;
403 } 402 }
@@ -961,4 +960,4 @@ namespace OpenSim.Region.Capabilities
961 } 960 }
962 } 961 }
963 } 962 }
964} 963} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index f101131..e76a5c5 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -29,7 +29,7 @@ using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework.Servers; 30using OpenSim.Framework.Servers;
31 31
32namespace OpenSim.Region.Capabilities 32namespace OpenSim.Framework.Communications.Capabilities
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// CapsHandlers is a cap handler container but also takes 35 /// CapsHandlers is a cap handler container but also takes
@@ -141,4 +141,4 @@ namespace OpenSim.Region.Capabilities
141 } 141 }
142 } 142 }
143 } 143 }
144} 144} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index b3e841c..13361c7 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -34,7 +34,7 @@ using System.Text;
34using System.Xml; 34using System.Xml;
35using libsecondlife; 35using libsecondlife;
36 36
37namespace OpenSim.Region.Capabilities 37namespace OpenSim.Framework.Communications.Capabilities
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code. 40 /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code.
@@ -676,4 +676,4 @@ namespace OpenSim.Region.Capabilities
676 } 676 }
677 } 677 }
678 } 678 }
679} 679} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
index a5cdd73..3579cc2 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections; 28using System.Collections;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDType("ARRAY")] 32 [LLSDType("ARRAY")]
33 public class LLSDArray 33 public class LLSDArray
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities
38 { 38 {
39 } 39 }
40 } 40 }
41} 41} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 1393523..6c4db4b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Region.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
33 [LLSDType("MAP")] 33 [LLSDType("MAP")]
34 public class LLSDAssetUploadComplete 34 public class LLSDAssetUploadComplete
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities
42 { 42 {
43 } 43 }
44 } 44 }
45} 45} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index e71a73e..289cc93 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Region.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
33 [LLSDMap] 33 [LLSDMap]
34 public class LLSDAssetUploadRequest 34 public class LLSDAssetUploadRequest
@@ -43,4 +43,4 @@ namespace OpenSim.Region.Capabilities
43 { 43 {
44 } 44 }
45 } 45 }
46} 46} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index bb293ba..63b3351 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDAssetUploadResponse 33 public class LLSDAssetUploadResponse
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
index c1b15b4..5ff21b8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Capabilities 28namespace OpenSim.Framework.Communications.Capabilities
29{ 29{
30 [LLSDType("MAP")] 30 [LLSDType("MAP")]
31 public class LLSDCapEvent 31 public class LLSDCapEvent
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
37 { 37 {
38 } 38 }
39 } 39 }
40} 40} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
index 5a44e26..4abdb59 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Capabilities 28namespace OpenSim.Framework.Communications.Capabilities
29{ 29{
30 [LLSDType("MAP")] 30 [LLSDType("MAP")]
31 public class LLSDEmpty 31 public class LLSDEmpty
@@ -34,4 +34,4 @@ namespace OpenSim.Region.Capabilities
34 { 34 {
35 } 35 }
36 } 36 }
37} 37} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index a39f5aa..409d2e0 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -31,7 +31,7 @@ using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33 33
34namespace OpenSim.Region.Capabilities 34namespace OpenSim.Framework.Communications.Capabilities
35{ 35{
36 public class LLSDHelpers 36 public class LLSDHelpers
37 { 37 {
@@ -160,4 +160,4 @@ namespace OpenSim.Region.Capabilities
160 return obj; 160 return obj;
161 } 161 }
162 } 162 }
163} 163} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index d402579..31896c2 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDInventoryItem 33 public class LLSDInventoryItem
@@ -68,15 +68,6 @@ namespace OpenSim.Region.Capabilities
68 public string sale_type; 68 public string sale_type;
69 } 69 }
70 70
71 /* [LLSDMap]
72 public class LLSDFolderItem
73 {
74 public LLUUID folder_id;
75 public LLUUID parent_id;
76 public int type;
77 public string name;
78 }*/
79
80 [LLSDMap] 71 [LLSDMap]
81 public class LLSDInventoryDescendents 72 public class LLSDInventoryDescendents
82 { 73 {
@@ -103,4 +94,4 @@ namespace OpenSim.Region.Capabilities
103 public LLUUID owner___id; // and of course we can't have field names with "-" in 94 public LLUUID owner___id; // and of course we can't have field names with "-" in
104 public int version; 95 public int version;
105 } 96 }
106} 97} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 6211c4f..2c4b68f 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDItemUpdate 33 public class LLSDItemUpdate
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities
38 { 38 {
39 } 39 }
40 } 40 }
41} 41} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 0cf82a8..50f5241 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDType("MAP")] 32 [LLSDType("MAP")]
33 public class LLSDMapLayer 33 public class LLSDMapLayer
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities
42 { 42 {
43 } 43 }
44 } 44 }
45} 45} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
index 205a645..7dabbec 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Capabilities 28namespace OpenSim.Framework.Communications.Capabilities
29{ 29{
30 [LLSDType("MAP")] 30 [LLSDType("MAP")]
31 public class LLSDMapLayerResponse 31 public class LLSDMapLayerResponse
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
37 { 37 {
38 } 38 }
39 } 39 }
40} 40} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
index 748c5ea..317e35d 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Capabilities 28namespace OpenSim.Framework.Communications.Capabilities
29{ 29{
30 [LLSDType("MAP")] 30 [LLSDType("MAP")]
31 public class LLSDMapRequest 31 public class LLSDMapRequest
@@ -36,4 +36,4 @@ namespace OpenSim.Region.Capabilities
36 { 36 {
37 } 37 }
38 } 38 }
39} 39} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
index deb9223..55d62ac 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Capabilities 28namespace OpenSim.Framework.Communications.Capabilities
29{ 29{
30 public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request); 30 public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
31} 31} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
index 4439346..fb5eaa8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -28,7 +28,7 @@
28 28
29using System.Collections; 29using System.Collections;
30 30
31namespace OpenSim.Region.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
33 [LLSDMap] 33 [LLSDMap]
34 public class LLSDParcelVoiceInfoResponse 34 public class LLSDParcelVoiceInfoResponse
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 545643a..5e8a08f 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -30,7 +30,7 @@ using System.IO;
30using System.Text; 30using System.Text;
31using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
32 32
33namespace OpenSim.Region.Capabilities 33namespace OpenSim.Framework.Communications.Capabilities
34{ 34{
35 public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler 35 public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
36 where TRequest : new() 36 where TRequest : new()
@@ -65,4 +65,4 @@ namespace OpenSim.Region.Capabilities
65 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); 65 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
66 } 66 }
67 } 67 }
68} 68} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
index 22e45f4..ee9ff1b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDTaskInventoryUploadComplete 33 public class LLSDTaskInventoryUploadComplete
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities
47 /// </summary> 47 /// </summary>
48 public string state; 48 public string state;
49 } 49 }
50} 50} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
index ed7e824..df32d1a 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDTaskScriptUpdate 33 public class LLSDTaskScriptUpdate
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities
47 /// </summary> 47 /// </summary>
48 public int is_script_running; 48 public int is_script_running;
49 } 49 }
50} 50} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
index d050176..91db060 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.Capabilities 28namespace OpenSim.Framework.Communications.Capabilities
29{ 29{
30 [LLSDType("MAP")] 30 [LLSDType("MAP")]
31 public class LLSDTest 31 public class LLSDTest
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
37 { 37 {
38 } 38 }
39 } 39 }
40} 40} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
index bdc8e79..181a465 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29 29
30namespace OpenSim.Region.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [AttributeUsage(AttributeTargets.Class)] 32 [AttributeUsage(AttributeTargets.Class)]
33 public class LLSDType : Attribute 33 public class LLSDType : Attribute
@@ -52,4 +52,4 @@ namespace OpenSim.Region.Capabilities
52 { 52 {
53 } 53 }
54 } 54 }
55} 55} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
index 941e70e..67064b0 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
@@ -26,7 +26,7 @@
26* 26*
27*/ 27*/
28 28
29namespace OpenSim.Region.Capabilities 29namespace OpenSim.Framework.Communications.Capabilities
30{ 30{
31 [LLSDMap] 31 [LLSDMap]
32 public class LLSDVoiceAccountResponse 32 public class LLSDVoiceAccountResponse
diff --git a/OpenSim/Framework/Communications/GenericAsyncResult.cs b/OpenSim/Framework/Communications/GenericAsyncResult.cs
new file mode 100644
index 0000000..ed41614
--- /dev/null
+++ b/OpenSim/Framework/Communications/GenericAsyncResult.cs
@@ -0,0 +1,156 @@
1using System;
2using System.Threading;
3
4namespace OpenSim.Framework.Communications
5{
6 internal class SimpleAsyncResult : IAsyncResult
7 {
8 private readonly AsyncCallback m_callback;
9
10 /// <summary>
11 /// Is process completed?
12 /// </summary>
13 /// <remarks>Should really be boolean, but VolatileRead has no boolean method</remarks>
14 private byte m_completed;
15
16 /// <summary>
17 /// Did process complete synchroneously?
18 /// </summary>
19 /// <remarks>I have a hard time imagining a scenario where this is the case, again, same issue about
20 /// booleans and VolatileRead as m_completed
21 /// </remarks>
22 private byte m_completedSynchronously;
23
24 private readonly object m_asyncState;
25 private ManualResetEvent m_waitHandle;
26 private Exception m_exception;
27
28 internal SimpleAsyncResult(AsyncCallback cb, object state)
29 {
30 m_callback = cb;
31 m_asyncState = state;
32 m_completed = 0;
33 m_completedSynchronously = 1;
34 }
35
36 #region IAsyncResult Members
37
38 public object AsyncState
39 {
40 get { return m_asyncState; }
41 }
42
43 public WaitHandle AsyncWaitHandle
44 {
45 get
46 {
47 if (m_waitHandle == null)
48 {
49 bool done = IsCompleted;
50 ManualResetEvent mre = new ManualResetEvent(done);
51 if (Interlocked.CompareExchange(ref m_waitHandle, mre, null) != null)
52 {
53 mre.Close();
54 }
55 else
56 {
57 if (!done && IsCompleted)
58 {
59 m_waitHandle.Set();
60 }
61 }
62 }
63 return m_waitHandle;
64 }
65 }
66
67
68 public bool CompletedSynchronously
69 {
70 get { return Thread.VolatileRead(ref m_completedSynchronously) == 1; }
71 }
72
73
74 public bool IsCompleted
75 {
76 get { return Thread.VolatileRead(ref m_completed) == 1; }
77 }
78
79 #endregion
80
81 #region class Methods
82
83 internal void SetAsCompleted(bool completedSynchronously)
84 {
85 m_completed = 1;
86 if (completedSynchronously)
87 m_completedSynchronously = 1;
88 else
89 m_completedSynchronously = 0;
90
91 SignalCompletion();
92 }
93
94 internal void HandleException(Exception e, bool completedSynchronously)
95 {
96 m_completed = 1;
97 if (completedSynchronously)
98 m_completedSynchronously = 1;
99 else
100 m_completedSynchronously = 0;
101 m_exception = e;
102
103 SignalCompletion();
104 }
105
106 private void SignalCompletion()
107 {
108 if (m_waitHandle != null) m_waitHandle.Set();
109
110 if (m_callback != null) m_callback(this);
111 }
112
113 public void EndInvoke()
114 {
115 // This method assumes that only 1 thread calls EndInvoke
116 if (!IsCompleted)
117 {
118 // If the operation isn't done, wait for it
119 AsyncWaitHandle.WaitOne();
120 AsyncWaitHandle.Close();
121 m_waitHandle = null; // Allow early GC
122 }
123
124 // Operation is done: if an exception occured, throw it
125 if (m_exception != null) throw m_exception;
126 }
127
128 #endregion
129 }
130
131 internal class AsyncResult<T> : SimpleAsyncResult
132 {
133 private T m_result = default(T);
134
135 public AsyncResult(AsyncCallback asyncCallback, Object state) :
136 base(asyncCallback, state)
137 {
138 }
139
140 public void SetAsCompleted(T result, bool completedSynchronously)
141 {
142 // Save the asynchronous operation's result
143 m_result = result;
144
145 // Tell the base class that the operation completed
146 // sucessfully (no exception)
147 base.SetAsCompleted(completedSynchronously);
148 }
149
150 public new T EndInvoke()
151 {
152 base.EndInvoke();
153 return m_result;
154 }
155 }
156} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 2b6e0d5..7c243c6 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -28,7 +28,7 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework.Communications
32{ 32{
33 public interface IUserService 33 public interface IUserService
34 { 34 {
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index a379253..f7989ab 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -34,7 +34,7 @@ using libsecondlife.StructuredData;
34using log4net; 34using log4net;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36 36
37namespace OpenSim.Framework.UserManagement 37namespace OpenSim.Framework.Communications
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// A temp class to handle login response. 40 /// A temp class to handle login response.
@@ -777,4 +777,4 @@ namespace OpenSim.Framework.UserManagement
777 } 777 }
778 } 778 }
779 } 779 }
780} 780} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 37c0bd8..db4e2ec 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -40,7 +40,7 @@ using Nwc.XmlRpc;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42 42
43namespace OpenSim.Framework.UserManagement 43namespace OpenSim.Framework.Communications
44{ 44{
45 public abstract class LoginService 45 public abstract class LoginService
46 { 46 {
@@ -122,8 +122,8 @@ namespace OpenSim.Framework.UserManagement
122 lastname = (string) requestData["last"]; 122 lastname = (string) requestData["last"];
123 123
124 m_log.InfoFormat( 124 m_log.InfoFormat(
125 "[LOGIN BEGIN]: Received login request message from user {0} {1}", 125 "[LOGIN BEGIN]: Received login request message from user {0} {1}",
126 firstname, lastname); 126 firstname, lastname);
127 127
128 string clientVersion = "Unknown"; 128 string clientVersion = "Unknown";
129 129
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.UserManagement
138 } 138 }
139 139
140 m_log.DebugFormat( 140 m_log.DebugFormat(
141 "[LOGIN]: Client is {0}, start location is {1}", clientVersion, startLocationRequest); 141 "[LOGIN]: Client is {0}, start location is {1}", clientVersion, startLocationRequest);
142 142
143 userProfile = GetTheUser(firstname, lastname); 143 userProfile = GetTheUser(firstname, lastname);
144 if (userProfile == null) 144 if (userProfile == null)
@@ -163,8 +163,8 @@ namespace OpenSim.Framework.UserManagement
163 catch (Exception e) 163 catch (Exception e)
164 { 164 {
165 m_log.InfoFormat( 165 m_log.InfoFormat(
166 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", 166 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}",
167 requestData["web_login_key"], firstname, lastname, e); 167 requestData["web_login_key"], firstname, lastname, e);
168 168
169 return logResponse.CreateFailedResponse(); 169 return logResponse.CreateFailedResponse();
170 } 170 }
@@ -201,8 +201,8 @@ namespace OpenSim.Framework.UserManagement
201 // Reject the login 201 // Reject the login
202 202
203 m_log.InfoFormat( 203 m_log.InfoFormat(
204 "[LOGIN END]: Notifying user {0} {1} that they are already logged in", 204 "[LOGIN END]: Notifying user {0} {1} that they are already logged in",
205 firstname, lastname); 205 firstname, lastname);
206 206
207 return logResponse.CreateAlreadyLoggedInResponse(); 207 return logResponse.CreateAlreadyLoggedInResponse();
208 } 208 }
@@ -286,8 +286,8 @@ namespace OpenSim.Framework.UserManagement
286 StatsManager.UserStats.AddSuccessfulLogin(); 286 StatsManager.UserStats.AddSuccessfulLogin();
287 287
288 m_log.DebugFormat( 288 m_log.DebugFormat(
289 "[LOGIN END]: Authentication of user {0} {1} successful. Sending response to client.", 289 "[LOGIN END]: Authentication of user {0} {1} successful. Sending response to client.",
290 firstname, lastname); 290 firstname, lastname);
291 291
292 return logResponse.ToXmlRpcResponse(); 292 return logResponse.ToXmlRpcResponse();
293 } 293 }
@@ -516,9 +516,9 @@ namespace OpenSim.Framework.UserManagement
516 statuscode = 301; 516 statuscode = 301;
517 517
518 string redirectURL = "about:blank?redirect-http-hack=" + 518 string redirectURL = "about:blank?redirect-http-hack=" +
519 HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + 519 HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
520 lastname + 520 lastname +
521 "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); 521 "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
522 //m_log.Info("[WEB]: R:" + redirectURL); 522 //m_log.Info("[WEB]: R:" + redirectURL);
523 returnactions["int_response_code"] = statuscode; 523 returnactions["int_response_code"] = statuscode;
524 returnactions["str_redirect_location"] = redirectURL; 524 returnactions["str_redirect_location"] = redirectURL;
@@ -677,7 +677,7 @@ namespace OpenSim.Framework.UserManagement
677 //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); 677 //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password);
678 678
679 passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) 679 passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase)
680 || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); 680 || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase));
681 681
682 return passwordSuccess; 682 return passwordSuccess;
683 } 683 }
@@ -792,4 +792,4 @@ namespace OpenSim.Framework.UserManagement
792 } 792 }
793 } 793 }
794 } 794 }
795} 795} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
new file mode 100644
index 0000000..91284e8
--- /dev/null
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -0,0 +1,368 @@
1using System;
2using System.Collections.Generic;
3using System.IO;
4using System.Net;
5using System.Reflection;
6using System.Text;
7using System.Threading;
8using System.Web;
9using log4net;
10
11namespace OpenSim.Framework.Communications
12{
13 /// <summary>
14 /// Implementation of a generic REST client
15 /// </summary>
16 /// <remarks>
17 /// This class is a generic implementation of a REST (Representational State Transfer) web service. This
18 /// class is designed to execute both synchroneously and asynchroneously.
19 ///
20 /// Internally the implementation works as a two stage asynchroneous web-client.
21 /// When the request is initiated, RestClient will query asynchroneously for for a web-response,
22 /// sleeping until the initial response is returned by the server. Once the initial response is retrieved
23 /// the second stage of asynchroneous requests will be triggered, in an attempt to read of the response
24 /// object into a memorystream as a sequence of asynchroneous reads.
25 ///
26 /// The asynchronisity of RestClient is designed to move as much processing into the back-ground, allowing
27 /// other threads to execute, while it waits for a response from the web-service. RestClient it self, can be
28 /// invoked by the caller in either synchroneous mode or asynchroneous mode.
29 /// </remarks>
30 public class RestClient
31 {
32 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
33
34 private string realuri;
35
36 #region member variables
37
38 /// <summary>
39 /// The base Uri of the web-service e.g. http://www.google.com
40 /// </summary>
41 private string _url;
42
43 /// <summary>
44 /// Path elements of the query
45 /// </summary>
46 private List<string> _pathElements = new List<string>();
47
48 /// <summary>
49 /// Parameter elements of the query, e.g. min=34
50 /// </summary>
51 private Dictionary<string, string> _parameterElements = new Dictionary<string, string>();
52
53 /// <summary>
54 /// Request method. E.g. GET, POST, PUT or DELETE
55 /// </summary>
56 private string _method;
57
58 /// <summary>
59 /// Temporary buffer used to store bytes temporarily as they come in from the server
60 /// </summary>
61 private byte[] _readbuf;
62
63 /// <summary>
64 /// MemoryStream representing the resultiong resource
65 /// </summary>
66 private Stream _resource;
67
68 /// <summary>
69 /// WebRequest object, held as a member variable
70 /// </summary>
71 private HttpWebRequest _request;
72
73 /// <summary>
74 /// WebResponse object, held as a member variable, so we can close it
75 /// </summary>
76 private HttpWebResponse _response;
77
78 /// <summary>
79 /// This flag will help block the main synchroneous method, in case we run in synchroneous mode
80 /// </summary>
81 public static ManualResetEvent _allDone = new ManualResetEvent(false);
82
83 /// <summary>
84 /// Default time out period
85 /// </summary>
86 private const int DefaultTimeout = 10*1000; // 10 seconds timeout
87
88 /// <summary>
89 /// Default Buffer size of a block requested from the web-server
90 /// </summary>
91 private const int BufferSize = 4096; // Read blocks of 4 KB.
92
93
94 /// <summary>
95 /// if an exception occours during async processing, we need to save it, so it can be
96 /// rethrown on the primary thread;
97 /// </summary>
98 private Exception _asyncException;
99
100 #endregion member variables
101
102 #region constructors
103
104 /// <summary>
105 /// Instantiate a new RestClient
106 /// </summary>
107 /// <param name="url">Web-service to query, e.g. http://osgrid.org:8003</param>
108 public RestClient(string url)
109 {
110 _url = url;
111 _readbuf = new byte[BufferSize];
112 _resource = new MemoryStream();
113 _request = null;
114 _response = null;
115 _lock = new object();
116 }
117
118 private object _lock;
119
120 #endregion constructors
121
122 /// <summary>
123 /// Add a path element to the query, e.g. assets
124 /// </summary>
125 /// <param name="element">path entry</param>
126 public void AddResourcePath(string element)
127 {
128 if (isSlashed(element))
129 _pathElements.Add(element.Substring(0, element.Length - 1));
130 else
131 _pathElements.Add(element);
132 }
133
134 /// <summary>
135 /// Add a query parameter to the Url
136 /// </summary>
137 /// <param name="name">Name of the parameter, e.g. min</param>
138 /// <param name="value">Value of the parameter, e.g. 42</param>
139 public void AddQueryParameter(string name, string value)
140 {
141 _parameterElements.Add(HttpUtility.UrlEncode(name), HttpUtility.UrlEncode(value));
142 }
143
144 /// <summary>
145 /// Add a query parameter to the Url
146 /// </summary>
147 /// <param name="name">Name of the parameter, e.g. min</param>
148 public void AddQueryParameter(string name)
149 {
150 _parameterElements.Add(HttpUtility.UrlEncode(name), null);
151 }
152
153 /// <summary>
154 /// Web-Request method, e.g. GET, PUT, POST, DELETE
155 /// </summary>
156 public string RequestMethod
157 {
158 get { return _method; }
159 set { _method = value; }
160 }
161
162 /// <summary>
163 /// True if string contains a trailing slash '/'
164 /// </summary>
165 /// <param name="s">string to be examined</param>
166 /// <returns>true if slash is present</returns>
167 private bool isSlashed(string s)
168 {
169 return s.Substring(s.Length - 1, 1) == "/";
170 }
171
172 /// <summary>
173 /// Build a Uri based on the initial Url, path elements and parameters
174 /// </summary>
175 /// <returns>fully constructed Uri</returns>
176 private Uri buildUri()
177 {
178 StringBuilder sb = new StringBuilder();
179 sb.Append(_url);
180
181 foreach (string e in _pathElements)
182 {
183 sb.Append("/");
184 sb.Append(e);
185 }
186
187 bool firstElement = true;
188 foreach (KeyValuePair<string, string> kv in _parameterElements)
189 {
190 if (firstElement)
191 {
192 sb.Append("?");
193 firstElement = false;
194 }
195 else
196 sb.Append("&");
197
198 sb.Append(kv.Key);
199 if (kv.Value != null && kv.Value.Length != 0)
200 {
201 sb.Append("=");
202 sb.Append(kv.Value);
203 }
204 }
205 realuri = sb.ToString();
206 //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
207 return new Uri(sb.ToString());
208 }
209
210 #region Async communications with server
211
212 /// <summary>
213 /// Async method, invoked when a block of data has been received from the service
214 /// </summary>
215 /// <param name="ar"></param>
216 private void StreamIsReadyDelegate(IAsyncResult ar)
217 {
218 try
219 {
220 Stream s = (Stream) ar.AsyncState;
221 int read = s.EndRead(ar);
222
223 if (read > 0)
224 {
225 _resource.Write(_readbuf, 0, read);
226 IAsyncResult asynchronousResult =
227 s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
228
229 // TODO! Implement timeout, without killing the server
230 //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
231 }
232 else
233 {
234 s.Close();
235 _allDone.Set();
236 }
237 }
238 catch (Exception e)
239 {
240 _allDone.Set();
241 _asyncException = e;
242 }
243 }
244
245 #endregion Async communications with server
246
247 /// <summary>
248 /// Perform synchroneous request
249 /// </summary>
250 public Stream Request()
251 {
252 lock (_lock)
253 {
254 _request = (HttpWebRequest) WebRequest.Create(buildUri());
255 _request.KeepAlive = false;
256 _request.ContentType = "application/xml";
257 _request.Timeout = 200000;
258 _asyncException = null;
259
260// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
261 _response = (HttpWebResponse) _request.GetResponse();
262 Stream src = _response.GetResponseStream();
263 int length = src.Read(_readbuf, 0, BufferSize);
264 while (length > 0)
265 {
266 _resource.Write(_readbuf, 0, length);
267 length = src.Read(_readbuf, 0, BufferSize);
268 }
269
270
271 // TODO! Implement timeout, without killing the server
272 // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
273 //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
274
275// _allDone.WaitOne();
276 if (_response != null)
277 _response.Close();
278 if (_asyncException != null)
279 throw _asyncException;
280
281 if (_resource != null)
282 {
283 _resource.Flush();
284 _resource.Seek(0, SeekOrigin.Begin);
285 }
286
287 return _resource;
288 }
289 }
290
291 public Stream Request(Stream src)
292 {
293 _request = (HttpWebRequest) WebRequest.Create(buildUri());
294 _request.KeepAlive = false;
295 _request.ContentType = "application/xml";
296 _request.Timeout = 900000;
297 _request.Method = RequestMethod;
298 _asyncException = null;
299 _request.ContentLength = src.Length;
300
301 m_log.InfoFormat("[REST]: Request Length {0}", _request.ContentLength);
302 m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
303 src.Seek(0, SeekOrigin.Begin);
304 m_log.Info("[REST]: Seek is ok");
305 Stream dst = _request.GetRequestStream();
306 m_log.Info("[REST]: GetRequestStream is ok");
307
308 byte[] buf = new byte[1024];
309 int length = src.Read(buf, 0, 1024);
310 m_log.Info("[REST]: First Read is ok");
311 while (length > 0)
312 {
313 dst.Write(buf, 0, length);
314 length = src.Read(buf, 0, 1024);
315 }
316
317 _response = (HttpWebResponse) _request.GetResponse();
318
319// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
320
321 // TODO! Implement timeout, without killing the server
322 // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
323 //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
324
325 return null;
326 }
327
328 #region Async Invocation
329
330 public IAsyncResult BeginRequest(AsyncCallback callback, object state)
331 {
332 /// <summary>
333 /// In case, we are invoked asynchroneously this object will keep track of the state
334 /// </summary>
335 AsyncResult<Stream> ar = new AsyncResult<Stream>(callback, state);
336 ThreadPool.QueueUserWorkItem(RequestHelper, ar);
337 return ar;
338 }
339
340 public Stream EndRequest(IAsyncResult asyncResult)
341 {
342 AsyncResult<Stream> ar = (AsyncResult<Stream>) asyncResult;
343
344 // Wait for operation to complete, then return result or
345 // throw exception
346 return ar.EndInvoke();
347 }
348
349 private void RequestHelper(Object asyncResult)
350 {
351 // We know that it's really an AsyncResult<DateTime> object
352 AsyncResult<Stream> ar = (AsyncResult<Stream>) asyncResult;
353 try
354 {
355 // Perform the operation; if sucessful set the result
356 Stream s = Request();
357 ar.SetAsCompleted(s, false);
358 }
359 catch (Exception e)
360 {
361 // If operation fails, set the exception
362 ar.HandleException(e, false);
363 }
364 }
365
366 #endregion Async Invocation
367 }
368} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0f7dc44..e4d8ca2 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -36,7 +36,7 @@ using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework.Statistics; 37using OpenSim.Framework.Statistics;
38 38
39namespace OpenSim.Framework.UserManagement 39namespace OpenSim.Framework.Communications
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// Base class for user management (create, read, etc) 42 /// Base class for user management (create, read, etc)
@@ -245,7 +245,7 @@ namespace OpenSim.Framework.UserManagement
245 { 245 {
246 try 246 try
247 { 247 {
248 plugin.Value.RemoveUserFriend(friendlistowner, friend); 248 plugin.Value.RemoveUserFriend(friendlistowner, friend);
249 } 249 }
250 catch (Exception e) 250 catch (Exception e)
251 { 251 {
@@ -370,7 +370,7 @@ namespace OpenSim.Framework.UserManagement
370 if ((profile.CurrentAgent.Position.X > 0) 370 if ((profile.CurrentAgent.Position.X > 0)
371 && (profile.CurrentAgent.Position.Y > 0) 371 && (profile.CurrentAgent.Position.Y > 0)
372 && (profile.CurrentAgent.Position.Z > 0) 372 && (profile.CurrentAgent.Position.Z > 0)
373 ) 373 )
374 { 374 {
375 // TODO: Right now, currentRegion has not been used in GridServer for requesting region. 375 // TODO: Right now, currentRegion has not been used in GridServer for requesting region.
376 // TODO: It is only using currentHandle. 376 // TODO: It is only using currentHandle.
@@ -564,7 +564,7 @@ namespace OpenSim.Framework.UserManagement
564 catch (Exception e) 564 catch (Exception e)
565 { 565 {
566 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString() 566 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
567 + " via " + plugin.Key + "(" + e.ToString() + ")"); 567 + " via " + plugin.Key + "(" + e.ToString() + ")");
568 return false; 568 return false;
569 } 569 }
570 } 570 }
@@ -596,4 +596,4 @@ namespace OpenSim.Framework.UserManagement
596 return false; 596 return false;
597 } 597 }
598 } 598 }
599} 599} \ No newline at end of file
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index e985c06..4770017 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -31,6 +31,7 @@ using System.Net;
31using System.Reflection; 31using System.Reflection;
32using System.Text; 32using System.Text;
33using log4net; 33using log4net;
34using OpenSim.Framework.Configuration.XML;
34 35
35namespace OpenSim.Framework.Configuration.HTTP 36namespace OpenSim.Framework.Configuration.HTTP
36{ 37{
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index c0b4ca0..0a9f751 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -29,7 +29,7 @@ using System;
29using System.IO; 29using System.IO;
30using System.Xml; 30using System.Xml;
31 31
32namespace OpenSim.Framework.Configuration 32namespace OpenSim.Framework.Configuration.XML
33{ 33{
34 public class XmlConfiguration : IGenericConfig 34 public class XmlConfiguration : IGenericConfig
35 { 35 {
@@ -135,4 +135,4 @@ namespace OpenSim.Framework.Configuration
135 doc = null; 135 doc = null;
136 } 136 }
137 } 137 }
138} 138} \ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
index 760c4e8..a02429c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Grid.ScriptServer 28namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
29{ 29{
30 public abstract class RegionBase 30 public abstract class RegionBase
31 { 31 {
@@ -240,4 +240,4 @@ namespace OpenSim.Grid.ScriptServer
240 onhttp_response(); 240 onhttp_response();
241 } 241 }
242 } 242 }
243} 243} \ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index b815a37..8c31b9b 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -25,9 +25,8 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Grid.ScriptServer 28namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
29{ 29{
30 // Maintains connection and communication to a region
31 public class RegionConnectionManager : RegionBase 30 public class RegionConnectionManager : RegionBase
32 { 31 {
33 private ScriptServerMain m_ScriptServerMain; 32 private ScriptServerMain m_ScriptServerMain;
@@ -39,4 +38,4 @@ namespace OpenSim.Grid.ScriptServer
39 m_Connection = Connection; 38 m_Connection = Connection;
40 } 39 }
41 } 40 }
42} 41} \ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index c87352c..8422bea 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -28,10 +28,10 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Threading; 29using System.Threading;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Grid.ScriptServer.ScriptServer.Region;
31 32
32namespace OpenSim.Grid.ScriptServer 33namespace OpenSim.Grid.ScriptServer.ScriptServer
33{ 34{
34 // Waiting for incoming script requests from region
35 internal class RegionCommManager 35 internal class RegionCommManager
36 { 36 {
37 private Thread listenThread; 37 private Thread listenThread;
@@ -99,4 +99,4 @@ namespace OpenSim.Grid.ScriptServer
99 Regions.Add(new RegionConnectionManager(m_ScriptServerMain, null)); 99 Regions.Add(new RegionConnectionManager(m_ScriptServerMain, null));
100 } 100 }
101 } 101 }
102} 102} \ No newline at end of file
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f294dcf..b123b8c 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -34,9 +34,9 @@ using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
39using OpenSim.Framework.UserManagement;
40 40
41namespace OpenSim.Grid.UserServer 41namespace OpenSim.Grid.UserServer
42{ 42{
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index aa2c959..5d0e1d6 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -34,7 +34,7 @@ using libsecondlife;
34using log4net; 34using log4net;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.UserManagement; 37using OpenSim.Framework.Communications;
38 38
39namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
40{ 40{
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;
37using OpenSim.Region.Environment; 37using OpenSim.Region.Environment;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40
40//using OpenSim.Framework.Console; 41//using OpenSim.Framework.Console;
41 42
42namespace OpenSim.Region.ClientStack 43namespace 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;
33using libsecondlife; 33using libsecondlife;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.UserManagement; 36using OpenSim.Framework.Communications;
37 37
38namespace OpenSim.Region.Communications.Local 38namespace OpenSim.Region.Communications.Local
39{ 39{
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;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.UserManagement;
33 32
34namespace OpenSim.Region.Communications.Local 33namespace OpenSim.Region.Communications.Local
35{ 34{
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;
35using log4net; 35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications;
38 39
39namespace OpenSim.Region.Communications.OGS1 40namespace OpenSim.Region.Communications.OGS1
40{ 41{
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;
38using log4net; 38using log4net;
39using Nini.Config; 39using Nini.Config;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Region.DataSnapshot.Interfaces;
41using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Environment.Interfaces;
42using OpenSim.Region.Environment.Scenes; 43using OpenSim.Region.Environment.Scenes;
43 44
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 @@
28using System; 28using System;
29using System.Xml; 29using System.Xml;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Region.DataSnapshot.Interfaces;
31using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Environment.Scenes;
32 33
33namespace OpenSim.Region.DataSnapshot 34namespace 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 @@
29using System.Xml; 29using System.Xml;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
31 31
32namespace OpenSim.Region.DataSnapshot 32namespace OpenSim.Region.DataSnapshot.Interfaces
33{ 33{
34 public interface IDataSnapshotProvider 34 public interface IDataSnapshotProvider
35 { 35 {
@@ -41,4 +41,4 @@ namespace OpenSim.Region.DataSnapshot
41 41
42 Scene GetParentScene { get; } 42 Scene GetParentScene { get; }
43 } 43 }
44} 44} \ 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;
33using libsecondlife; 33using libsecondlife;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.DataSnapshot.Interfaces;
36using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Modules.World.Land; 38using OpenSim.Region.Environment.Modules.World.Land;
38using OpenSim.Region.Environment.Scenes; 39using 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 @@
28using System.Reflection; 28using System.Reflection;
29using System.Xml; 29using System.Xml;
30using log4net; 30using log4net;
31using OpenSim.Region.DataSnapshot.Interfaces;
31using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Environment.Scenes;
32 33
33namespace OpenSim.Region.DataSnapshot 34namespace 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;
39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; 39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
42
42//TODO: Why do we reference InstantMessageModule here? 43//TODO: Why do we reference InstantMessageModule here?
43 44
44namespace OpenSim.Region.Environment 45namespace 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;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Communications.Capabilities;
37using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
38using OpenSim.Region.Capabilities;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
41using Caps=OpenSim.Region.Capabilities.Caps; 41using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
42 42
43namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice 43namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
44{ 44{
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;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Communications.Capabilities;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Region.Capabilities;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
40using Caps=OpenSim.Region.Capabilities.Caps; 40using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
41 41
42namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice 42namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice
43{ 43{
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 @@
1using OpenSim.Framework; 1using OpenSim.Framework;
2using OpenSim.Region.Environment.Modules.Communications.Interregion;
3using OpenSim.Region.Environment.Scenes; 2using OpenSim.Region.Environment.Scenes;
4 3
5namespace OpenSim.Region.Environment.Modules.Grid.Interregion 4namespace 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;
6using Nini.Config; 6using Nini.Config;
7using OpenSim.Framework; 7using OpenSim.Framework;
8using OpenSim.Region.Environment.Interfaces; 8using OpenSim.Region.Environment.Interfaces;
9using OpenSim.Region.Environment.Modules.Grid.Interregion;
10using OpenSim.Region.Environment.Scenes; 9using OpenSim.Region.Environment.Scenes;
11 10
12namespace OpenSim.Region.Environment.Modules.Communications.Interregion 11namespace OpenSim.Region.Environment.Modules.Grid.Interregion
13{ 12{
14 public class InterregionModule : IInterregionModule, IRegionModule 13 public class InterregionModule : IInterregionModule, IRegionModule
15 { 14 {
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 @@
27 27
28using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
29 29
30namespace OpenSim.Region.Environment.Modules.ExportSerialiser 30namespace OpenSim.Region.Environment.Modules.World.Serialiser
31{ 31{
32 internal interface IFileSerialiser 32 internal interface IFileSerialiser
33 { 33 {
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 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Environment.Scenes;
30 30
31namespace OpenSim.Region.Environment.Modules.ExportSerialiser 31namespace OpenSim.Region.Environment.Modules.World.Serialiser
32{ 32{
33 public interface IRegionSerialiser 33 public interface IRegionSerialiser
34 { 34 {
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;
32using System.Xml; 32using System.Xml;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34 34
35namespace OpenSim.Region.Environment.Modules.ExportSerialiser 35namespace OpenSim.Region.Environment.Modules.World.Serialiser
36{ 36{
37 internal class SerialiseObjects : IFileSerialiser 37 internal class SerialiseObjects : IFileSerialiser
38 { 38 {
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;
29using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; 29using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
31 31
32namespace OpenSim.Region.Environment.Modules.ExportSerialiser 32namespace OpenSim.Region.Environment.Modules.World.Serialiser
33{ 33{
34 internal class SerialiseTerrain : IFileSerialiser 34 internal class SerialiseTerrain : IFileSerialiser
35 { 35 {
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;
30using System.IO; 30using System.IO;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.Environment.Modules.ExportSerialiser;
34using OpenSim.Region.Environment.Modules.Framework; 33using OpenSim.Region.Environment.Modules.Framework;
35using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
36 35
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;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules 36namespace OpenSim.Region.Environment.Modules.World.Sun
37{ 37{
38 public class SunModule : IRegionModule 38 public class SunModule : IRegionModule
39 { 39 {
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;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39 39
40namespace OpenSim.Region.Environment.Modules 40namespace OpenSim.Region.Environment.Modules.World.TreePopulator
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later. 43 /// 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;
43using OpenSim.Region.Environment.Modules.World.Terrain; 43using OpenSim.Region.Environment.Modules.World.Terrain;
44using OpenSim.Region.Environment.Scenes.Scripting; 44using OpenSim.Region.Environment.Scenes.Scripting;
45using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
46using Caps=OpenSim.Region.Capabilities.Caps; 46using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
47using Image=System.Drawing.Image; 47using Image=System.Drawing.Image;
48using Timer=System.Timers.Timer; 48using Timer=System.Timers.Timer;
49 49
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;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32using Caps=OpenSim.Region.Capabilities.Caps; 32using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
33 33
34namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
35{ 35{
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;
32using log4net; 32using log4net;
33using Microsoft.CSharp; 33using Microsoft.CSharp;
34 34
35namespace OpenSim.Region.ExtensionsScriptModule.CSharp 35namespace OpenSim.Region.ExtensionsScriptModule.Engines.CSharp
36{ 36{
37 public class CSharpScriptEngine : IScriptCompiler 37 public class CSharpScriptEngine : IScriptCompiler
38 { 38 {
@@ -104,4 +104,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp
104 return LoadDotNetScript(csharpProvider, filename); 104 return LoadDotNetScript(csharpProvider, filename);
105 } 105 }
106 } 106 }
107} 107} \ 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 @@
27 27
28using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.CSharp.Examples
31{ 31{
32 public class LSLExportScript : IScript 32 public class LSLExportScript : IScript
33 { 33 {
@@ -72,4 +72,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
72 }*/ 72 }*/
73 } 73 }
74 } 74 }
75} 75} \ 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;
32using log4net; 32using log4net;
33using Microsoft.JScript; 33using Microsoft.JScript;
34 34
35namespace OpenSim.Region.ExtensionsScriptModule.JScript 35namespace OpenSim.Region.ExtensionsScriptModule.Engines.JScript
36{ 36{
37 public class JScriptEngine : IScriptCompiler 37 public class JScriptEngine : IScriptCompiler
38 { 38 {
@@ -104,4 +104,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JScript
104 return LoadDotNetScript(jscriptProvider, filename); 104 return LoadDotNetScript(jscriptProvider, filename);
105 } 105 }
106 } 106 }
107} 107} \ 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 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; 29using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
30 30
31namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 31namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
32{ 32{
33 public class ClassInstance : Object 33 public class ClassInstance : Object
34 { 34 {
@@ -40,4 +40,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
40 { 40 {
41 } 41 }
42 } 42 }
43} 43} \ 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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; 31using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
32using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; 32using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
33 33
34namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 34namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
35{ 35{
36 public class ClassRecord 36 public class ClassRecord
37 { 37 {
@@ -645,4 +645,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
645 645
646 #endregion 646 #endregion
647 } 647 }
648} 648} \ 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 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
31{ 31{
32 public class Heap 32 public class Heap
33 { 33 {
@@ -37,4 +37,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
37 { 37 {
38 } 38 }
39 } 39 }
40} 40} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; 28using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
29using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; 29using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
30 30
31namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 31namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
32{ 32{
33 partial class Thread 33 partial class Thread
34 { 34 {
@@ -616,4 +616,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
616 } 616 }
617 } 617 }
618 } 618 }
619} 619} \ 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 @@
27 27
28using System; 28using System;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
31{ 31{
32 partial class Thread 32 partial class Thread
33 { 33 {
@@ -101,4 +101,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
101 } 101 }
102 } 102 }
103 } 103 }
104} 104} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
29{ 29{
30 partial class Thread 30 partial class Thread
31 { 31 {
@@ -33,4 +33,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
33 { 33 {
34 } 34 }
35 } 35 }
36} 36} \ 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; 29using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
30using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; 30using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
31 31
32namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 32namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
33{ 33{
34 partial class Thread 34 partial class Thread
35 { 35 {
@@ -129,4 +129,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
129 } 129 }
130 } 130 }
131 } 131 }
132} 132} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
29{ 29{
30 public class MainMemory 30 public class MainMemory
31 { 31 {
@@ -38,4 +38,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
38 HeapArea = new Heap(); 38 HeapArea = new Heap();
39 } 39 }
40 } 40 }
41} 41} \ 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 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
31{ 31{
32 public class MethodMemory 32 public class MethodMemory
33 { 33 {
@@ -41,4 +41,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
41 MethodBuffer = new byte[20000]; 41 MethodBuffer = new byte[20000];
42 } 42 }
43 } 43 }
44} 44} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
29{ 29{
30 public class Object 30 public class Object
31 { 31 {
32 } 32 }
33} 33} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
29{ 29{
30 public enum OpCode : byte 30 public enum OpCode : byte
31 { 31 {
@@ -76,4 +76,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
76 getstatic = 178, 76 getstatic = 178,
77 putstatic = 179 77 putstatic = 179
78 } 78 }
79} 79} \ 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 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
31{ 31{
32 public class Stack 32 public class Stack
33 { 33 {
@@ -37,4 +37,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
37 { 37 {
38 } 38 }
39 } 39 }
40} 40} \ 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 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; 29using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
30 30
31namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 31namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
32{ 32{
33 public class StackFrame 33 public class StackFrame
34 { 34 {
@@ -43,4 +43,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
43 LocalVariables = new BaseType[20]; 43 LocalVariables = new BaseType[20];
44 } 44 }
45 } 45 }
46} 46} \ 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 @@
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
29using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; 29using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
30using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; 30using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
31 31
32namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 32namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
33{ 33{
34 public partial class Thread 34 public partial class Thread
35 { 35 {
@@ -108,4 +108,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
108 return m_Interpreter.Excute(); 108 return m_Interpreter.Excute();
109 } 109 }
110 } 110 }
111} 111} \ 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 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine
31{ 31{
32 public class JavaEngine : IScriptCompiler 32 public class JavaEngine : IScriptCompiler
33 { 33 {
@@ -48,4 +48,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
48 return returns; 48 return returns;
49 } 49 }
50 } 50 }
51} 51} \ 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;
31using System.IO; 31using System.IO;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34using OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM; 34using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM;
35 35
36namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine 36namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine
37{ 37{
38 public class JVMScript : IScript 38 public class JVMScript : IScript
39 { 39 {
@@ -163,4 +163,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
163 } 163 }
164 } 164 }
165 } 165 }
166} 166} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
29{ 29{
30 public class ArrayReference : BaseType 30 public class ArrayReference : BaseType
31 { 31 {
32 } 32 }
33} 33} \ 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 @@
27 27
28using System; 28using System;
29 29
30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types 30namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
31{ 31{
32 public class BaseType : Object 32 public class BaseType : Object
33 { 33 {
34 } 34 }
35} 35} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
29{ 29{
30 public class ObjectReference : BaseType 30 public class ObjectReference : BaseType
31 { 31 {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
35 { 35 {
36 } 36 }
37 } 37 }
38} 38} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
29{ 29{
30 public class Byte : BaseType 30 public class Byte : BaseType
31 { 31 {
32 } 32 }
33} 33} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
29{ 29{
30 public class Char : BaseType 30 public class Char : BaseType
31 { 31 {
32 } 32 }
33} 33} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
29{ 29{
30 public class Float : BaseType 30 public class Float : BaseType
31 { 31 {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
35 { 35 {
36 } 36 }
37 } 37 }
38} 38} \ 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes 28namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
29{ 29{
30 public class Int : BaseType 30 public class Int : BaseType
31 { 31 {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
35 { 35 {
36 } 36 }
37 } 37 }
38} 38} \ 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;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34using OpenSim.Region.ExtensionsScriptModule.CSharp; 34using OpenSim.Region.ExtensionsScriptModule.Engines.CSharp;
35using OpenSim.Region.ExtensionsScriptModule.JScript; 35using OpenSim.Region.ExtensionsScriptModule.Engines.JScript;
36using OpenSim.Region.ExtensionsScriptModule.JVMEngine; 36using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine;
37 37
38namespace OpenSim.Region.ExtensionsScriptModule 38namespace OpenSim.Region.ExtensionsScriptModule
39{ 39{
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;
6using log4net; 6using log4net;
7using Nini.Config; 7using Nini.Config;
8using OpenSim.Region.Environment.Interfaces; 8using OpenSim.Region.Environment.Interfaces;
9using OpenSim.Region.Environment.Modules.ExportSerialiser; 9using OpenSim.Region.Environment.Modules.World.Serialiser;
10using OpenSim.Region.Environment.Modules.World.Terrain; 10using OpenSim.Region.Environment.Modules.World.Terrain;
11using OpenSim.Region.Environment.Scenes; 11using OpenSim.Region.Environment.Scenes;
12using PumaCode.SvnDotNet.AprSharp; 12using 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
217 return m_LSL_Functions.llRound(f); 217 return m_LSL_Functions.llRound(f);
218 } 218 }
219 219
220 public double llVecMag(LSL_Types.Vector3 v) 220 public double llVecMag(vector v)
221 { 221 {
222 return m_LSL_Functions.llVecMag(v); 222 return m_LSL_Functions.llVecMag(v);
223 } 223 }
224 224
225 public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v) 225 public vector llVecNorm(vector v)
226 { 226 {
227 return m_LSL_Functions.llVecNorm(v); 227 return m_LSL_Functions.llVecNorm(v);
228 } 228 }
229 229
230 public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b) 230 public double llVecDist(vector a, vector b)
231 { 231 {
232 return m_LSL_Functions.llVecDist(a, b); 232 return m_LSL_Functions.llVecDist(a, b);
233 } 233 }
234 234
235 public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r) 235 public vector llRot2Euler(rotation r)
236 { 236 {
237 return m_LSL_Functions.llRot2Euler(r); 237 return m_LSL_Functions.llRot2Euler(r);
238 } 238 }
239 239
240 public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v) 240 public rotation llEuler2Rot(vector v)
241 { 241 {
242 return m_LSL_Functions.llEuler2Rot(v); 242 return m_LSL_Functions.llEuler2Rot(v);
243 } 243 }
244 244
245 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) 245 public rotation llAxes2Rot(vector fwd, vector left, vector up)
246 { 246 {
247 return m_LSL_Functions.llAxes2Rot(fwd, left, up); 247 return m_LSL_Functions.llAxes2Rot(fwd, left, up);
248 } 248 }
249 249
250 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r) 250 public vector llRot2Fwd(rotation r)
251 { 251 {
252 return m_LSL_Functions.llRot2Fwd(r); 252 return m_LSL_Functions.llRot2Fwd(r);
253 } 253 }
254 254
255 public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r) 255 public vector llRot2Left(rotation r)
256 { 256 {
257 return m_LSL_Functions.llRot2Left(r); 257 return m_LSL_Functions.llRot2Left(r);
258 } 258 }
259 259
260 public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r) 260 public vector llRot2Up(rotation r)
261 { 261 {
262 return m_LSL_Functions.llRot2Up(r); 262 return m_LSL_Functions.llRot2Up(r);
263 } 263 }
264 264
265 public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end) 265 public rotation llRotBetween(vector start, vector end)
266 { 266 {
267 return m_LSL_Functions.llRotBetween(start, end); 267 return m_LSL_Functions.llRotBetween(start, end);
268 } 268 }
@@ -340,22 +340,22 @@ namespace OpenSim.Region.ScriptEngine.Common
340 return m_LSL_Functions.llDetectedType(number); 340 return m_LSL_Functions.llDetectedType(number);
341 } 341 }
342 342
343 public LSL_Types.Vector3 llDetectedPos(int number) 343 public vector llDetectedPos(int number)
344 { 344 {
345 return m_LSL_Functions.llDetectedPos(number); 345 return m_LSL_Functions.llDetectedPos(number);
346 } 346 }
347 347
348 public LSL_Types.Vector3 llDetectedVel(int number) 348 public vector llDetectedVel(int number)
349 { 349 {
350 return m_LSL_Functions.llDetectedVel(number); 350 return m_LSL_Functions.llDetectedVel(number);
351 } 351 }
352 352
353 public LSL_Types.Vector3 llDetectedGrab(int number) 353 public vector llDetectedGrab(int number)
354 { 354 {
355 return m_LSL_Functions.llDetectedGrab(number); 355 return m_LSL_Functions.llDetectedGrab(number);
356 } 356 }
357 357
358 public LSL_Types.Quaternion llDetectedRot(int number) 358 public rotation llDetectedRot(int number)
359 { 359 {
360 return m_LSL_Functions.llDetectedRot(number); 360 return m_LSL_Functions.llDetectedRot(number);
361 } 361 }
@@ -378,17 +378,17 @@ namespace OpenSim.Region.ScriptEngine.Common
378 m_LSL_Functions.llDie(); 378 m_LSL_Functions.llDie();
379 } 379 }
380 380
381 public double llGround(LSL_Types.Vector3 offset) 381 public double llGround(vector offset)
382 { 382 {
383 return m_LSL_Functions.llGround(offset); 383 return m_LSL_Functions.llGround(offset);
384 } 384 }
385 385
386 public double llCloud(LSL_Types.Vector3 offset) 386 public double llCloud(vector offset)
387 { 387 {
388 return m_LSL_Functions.llCloud(offset); 388 return m_LSL_Functions.llCloud(offset);
389 } 389 }
390 390
391 public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset) 391 public vector llWind(vector offset)
392 { 392 {
393 return m_LSL_Functions.llWind(offset); 393 return m_LSL_Functions.llWind(offset);
394 } 394 }
@@ -403,17 +403,17 @@ namespace OpenSim.Region.ScriptEngine.Common
403 return m_LSL_Functions.llGetStatus(status); 403 return m_LSL_Functions.llGetStatus(status);
404 } 404 }
405 405
406 public void llSetScale(LSL_Types.Vector3 scale) 406 public void llSetScale(vector scale)
407 { 407 {
408 m_LSL_Functions.llSetScale(scale); 408 m_LSL_Functions.llSetScale(scale);
409 } 409 }
410 410
411 public LSL_Types.Vector3 llGetScale() 411 public vector llGetScale()
412 { 412 {
413 return m_LSL_Functions.llGetScale(); 413 return m_LSL_Functions.llGetScale();
414 } 414 }
415 415
416 public void llSetColor(LSL_Types.Vector3 color, int face) 416 public void llSetColor(vector color, int face)
417 { 417 {
418 m_LSL_Functions.llSetColor(color, face); 418 m_LSL_Functions.llSetColor(color, face);
419 } 419 }
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.Common
428 m_LSL_Functions.llSetAlpha(alpha, face); 428 m_LSL_Functions.llSetAlpha(alpha, face);
429 } 429 }
430 430
431 public LSL_Types.Vector3 llGetColor(int face) 431 public vector llGetColor(int face)
432 { 432 {
433 return m_LSL_Functions.llGetColor(face); 433 return m_LSL_Functions.llGetColor(face);
434 } 434 }
@@ -461,47 +461,47 @@ namespace OpenSim.Region.ScriptEngine.Common
461 // 461 //
462 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 462 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
463 // 463 //
464 public void llSetPos(LSL_Types.Vector3 pos) 464 public void llSetPos(vector pos)
465 { 465 {
466 m_LSL_Functions.llSetPos(pos); 466 m_LSL_Functions.llSetPos(pos);
467 } 467 }
468 468
469 public LSL_Types.Vector3 llGetPos() 469 public vector llGetPos()
470 { 470 {
471 return m_LSL_Functions.llGetPos(); 471 return m_LSL_Functions.llGetPos();
472 } 472 }
473 473
474 public LSL_Types.Vector3 llGetLocalPos() 474 public vector llGetLocalPos()
475 { 475 {
476 return m_LSL_Functions.llGetLocalPos(); 476 return m_LSL_Functions.llGetLocalPos();
477 } 477 }
478 478
479 public void llSetRot(LSL_Types.Quaternion rot) 479 public void llSetRot(rotation rot)
480 { 480 {
481 m_LSL_Functions.llSetRot(rot); 481 m_LSL_Functions.llSetRot(rot);
482 } 482 }
483 483
484 public LSL_Types.Quaternion llGetRot() 484 public rotation llGetRot()
485 { 485 {
486 return m_LSL_Functions.llGetRot(); 486 return m_LSL_Functions.llGetRot();
487 } 487 }
488 488
489 public LSL_Types.Quaternion llGetLocalRot() 489 public rotation llGetLocalRot()
490 { 490 {
491 return m_LSL_Functions.llGetLocalRot(); 491 return m_LSL_Functions.llGetLocalRot();
492 } 492 }
493 493
494 public void llSetForce(LSL_Types.Vector3 force, int local) 494 public void llSetForce(vector force, int local)
495 { 495 {
496 m_LSL_Functions.llSetForce(force, local); 496 m_LSL_Functions.llSetForce(force, local);
497 } 497 }
498 498
499 public LSL_Types.Vector3 llGetForce() 499 public vector llGetForce()
500 { 500 {
501 return m_LSL_Functions.llGetForce(); 501 return m_LSL_Functions.llGetForce();
502 } 502 }
503 503
504 public int llTarget(LSL_Types.Vector3 position, double range) 504 public int llTarget(vector position, double range)
505 { 505 {
506 return m_LSL_Functions.llTarget(position, range); 506 return m_LSL_Functions.llTarget(position, range);
507 } 507 }
@@ -511,7 +511,7 @@ namespace OpenSim.Region.ScriptEngine.Common
511 m_LSL_Functions.llTargetRemove(number); 511 m_LSL_Functions.llTargetRemove(number);
512 } 512 }
513 513
514 public int llRotTarget(LSL_Types.Quaternion rot, double error) 514 public int llRotTarget(rotation rot, double error)
515 { 515 {
516 return m_LSL_Functions.llRotTarget(rot, error); 516 return m_LSL_Functions.llRotTarget(rot, error);
517 } 517 }
@@ -521,7 +521,7 @@ namespace OpenSim.Region.ScriptEngine.Common
521 m_LSL_Functions.llRotTargetRemove(number); 521 m_LSL_Functions.llRotTargetRemove(number);
522 } 522 }
523 523
524 public void llMoveToTarget(LSL_Types.Vector3 target, double tau) 524 public void llMoveToTarget(vector target, double tau)
525 { 525 {
526 m_LSL_Functions.llMoveToTarget(target, tau); 526 m_LSL_Functions.llMoveToTarget(target, tau);
527 } 527 }
@@ -531,7 +531,7 @@ namespace OpenSim.Region.ScriptEngine.Common
531 m_LSL_Functions.llStopMoveToTarget(); 531 m_LSL_Functions.llStopMoveToTarget();
532 } 532 }
533 533
534 public void llApplyImpulse(LSL_Types.Vector3 force, int local) 534 public void llApplyImpulse(vector force, int local)
535 { 535 {
536 m_LSL_Functions.llApplyImpulse(force, local); 536 m_LSL_Functions.llApplyImpulse(force, local);
537 } 537 }
@@ -539,37 +539,37 @@ namespace OpenSim.Region.ScriptEngine.Common
539 // 539 //
540 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 540 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
541 // 541 //
542 public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) 542 public void llApplyRotationalImpulse(vector force, int local)
543 { 543 {
544 m_LSL_Functions.llApplyRotationalImpulse(force, local); 544 m_LSL_Functions.llApplyRotationalImpulse(force, local);
545 } 545 }
546 546
547 public void llSetTorque(LSL_Types.Vector3 torque, int local) 547 public void llSetTorque(vector torque, int local)
548 { 548 {
549 m_LSL_Functions.llSetTorque(torque, local); 549 m_LSL_Functions.llSetTorque(torque, local);
550 } 550 }
551 551
552 public LSL_Types.Vector3 llGetTorque() 552 public vector llGetTorque()
553 { 553 {
554 return m_LSL_Functions.llGetTorque(); 554 return m_LSL_Functions.llGetTorque();
555 } 555 }
556 556
557 public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local) 557 public void llSetForceAndTorque(vector force, vector torque, int local)
558 { 558 {
559 m_LSL_Functions.llSetForceAndTorque(force, torque, local); 559 m_LSL_Functions.llSetForceAndTorque(force, torque, local);
560 } 560 }
561 561
562 public LSL_Types.Vector3 llGetVel() 562 public vector llGetVel()
563 { 563 {
564 return m_LSL_Functions.llGetVel(); 564 return m_LSL_Functions.llGetVel();
565 } 565 }
566 566
567 public LSL_Types.Vector3 llGetAccel() 567 public vector llGetAccel()
568 { 568 {
569 return m_LSL_Functions.llGetAccel(); 569 return m_LSL_Functions.llGetAccel();
570 } 570 }
571 571
572 public LSL_Types.Vector3 llGetOmega() 572 public vector llGetOmega()
573 { 573 {
574 return m_LSL_Functions.llGetOmega(); 574 return m_LSL_Functions.llGetOmega();
575 } 575 }
@@ -697,12 +697,12 @@ namespace OpenSim.Region.ScriptEngine.Common
697 m_LSL_Functions.llMakeFire(); 697 m_LSL_Functions.llMakeFire();
698 } 698 }
699 699
700 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param) 700 public void llRezObject(string inventory, vector pos, rotation rot, int param)
701 { 701 {
702 m_LSL_Functions.llRezObject(inventory, pos, rot, param); 702 m_LSL_Functions.llRezObject(inventory, pos, rot, param);
703 } 703 }
704 704
705 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping) 705 public void llLookAt(vector target, double strength, double damping)
706 { 706 {
707 m_LSL_Functions.llLookAt(target, strength, damping); 707 m_LSL_Functions.llLookAt(target, strength, damping);
708 } 708 }
@@ -815,7 +815,7 @@ namespace OpenSim.Region.ScriptEngine.Common
815 m_LSL_Functions.llSoundPreload(); 815 m_LSL_Functions.llSoundPreload();
816 } 816 }
817 817
818 public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping) 818 public void llRotLookAt(rotation target, double strength, double damping)
819 { 819 {
820 m_LSL_Functions.llRotLookAt(target, strength, damping); 820 m_LSL_Functions.llRotLookAt(target, strength, damping);
821 } 821 }
@@ -848,7 +848,7 @@ namespace OpenSim.Region.ScriptEngine.Common
848 m_LSL_Functions.llStopPointAt(); 848 m_LSL_Functions.llStopPointAt();
849 } 849 }
850 850
851 public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain) 851 public void llTargetOmega(vector axis, double spinrate, double gain)
852 { 852 {
853 m_LSL_Functions.llTargetOmega(axis, spinrate, gain); 853 m_LSL_Functions.llTargetOmega(axis, spinrate, gain);
854 } 854 }
@@ -858,7 +858,7 @@ namespace OpenSim.Region.ScriptEngine.Common
858 return m_LSL_Functions.llGetStartParameter(); 858 return m_LSL_Functions.llGetStartParameter();
859 } 859 }
860 860
861 public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos) 861 public void llGodLikeRezObject(string inventory, vector pos)
862 { 862 {
863 m_LSL_Functions.llGodLikeRezObject(inventory, pos); 863 m_LSL_Functions.llGodLikeRezObject(inventory, pos);
864 } 864 }
@@ -883,7 +883,7 @@ namespace OpenSim.Region.ScriptEngine.Common
883 return m_LSL_Functions.llGetLinkNumber(); 883 return m_LSL_Functions.llGetLinkNumber();
884 } 884 }
885 885
886 public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face) 886 public void llSetLinkColor(int linknumber, vector color, int face)
887 { 887 {
888 m_LSL_Functions.llSetLinkColor(linknumber, color, face); 888 m_LSL_Functions.llSetLinkColor(linknumber, color, face);
889 } 889 }
@@ -946,12 +946,12 @@ namespace OpenSim.Region.ScriptEngine.Common
946 m_LSL_Functions.llRemoveInventory(item); 946 m_LSL_Functions.llRemoveInventory(item);
947 } 947 }
948 948
949 public void llSetText(string text, LSL_Types.Vector3 color, double alpha) 949 public void llSetText(string text, vector color, double alpha)
950 { 950 {
951 m_LSL_Functions.llSetText(text, color, alpha); 951 m_LSL_Functions.llSetText(text, color, alpha);
952 } 952 }
953 953
954 public double llWater(LSL_Types.Vector3 offset) 954 public double llWater(vector offset)
955 { 955 {
956 return m_LSL_Functions.llWater(offset); 956 return m_LSL_Functions.llWater(offset);
957 } 957 }
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1011 m_LSL_Functions.llMessageLinked(linknum, num, str, id); 1011 m_LSL_Functions.llMessageLinked(linknum, num, str, id);
1012 } 1012 }
1013 1013
1014 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) 1014 public void llPushObject(string target, vector impulse, vector ang_impulse, int local)
1015 { 1015 {
1016 m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); 1016 m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local);
1017 } 1017 }
@@ -1034,17 +1034,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1034 // 1034 //
1035 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 1035 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
1036 // 1036 //
1037 public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) 1037 public rotation llAxisAngle2Rot(vector axis, double angle)
1038 { 1038 {
1039 return m_LSL_Functions.llAxisAngle2Rot(axis, angle); 1039 return m_LSL_Functions.llAxisAngle2Rot(axis, angle);
1040 } 1040 }
1041 1041
1042 public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) 1042 public vector llRot2Axis(rotation rot)
1043 { 1043 {
1044 return m_LSL_Functions.llRot2Axis(rot); 1044 return m_LSL_Functions.llRot2Axis(rot);
1045 } 1045 }
1046 1046
1047 public double llRot2Angle(LSL_Types.Quaternion rot) 1047 public double llRot2Angle(rotation rot)
1048 { 1048 {
1049 return m_LSL_Functions.llRot2Angle(rot); 1049 return m_LSL_Functions.llRot2Angle(rot);
1050 } 1050 }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1059 return m_LSL_Functions.llAsin(val); 1059 return m_LSL_Functions.llAsin(val);
1060 } 1060 }
1061 1061
1062 public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b) 1062 public double llAngleBetween(rotation a, rotation b)
1063 { 1063 {
1064 return m_LSL_Functions.llAngleBetween(a, b); 1064 return m_LSL_Functions.llAngleBetween(a, b);
1065 } 1065 }
@@ -1074,17 +1074,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1074 m_LSL_Functions.llAllowInventoryDrop(add); 1074 m_LSL_Functions.llAllowInventoryDrop(add);
1075 } 1075 }
1076 1076
1077 public LSL_Types.Vector3 llGetSunDirection() 1077 public vector llGetSunDirection()
1078 { 1078 {
1079 return m_LSL_Functions.llGetSunDirection(); 1079 return m_LSL_Functions.llGetSunDirection();
1080 } 1080 }
1081 1081
1082 public LSL_Types.Vector3 llGetTextureOffset(int face) 1082 public vector llGetTextureOffset(int face)
1083 { 1083 {
1084 return m_LSL_Functions.llGetTextureOffset(face); 1084 return m_LSL_Functions.llGetTextureOffset(face);
1085 } 1085 }
1086 1086
1087 public LSL_Types.Vector3 llGetTextureScale(int side) 1087 public vector llGetTextureScale(int side)
1088 { 1088 {
1089 return m_LSL_Functions.llGetTextureScale(side); 1089 return m_LSL_Functions.llGetTextureScale(side);
1090 } 1090 }
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1104 return m_LSL_Functions.llGetOwnerKey(id); 1104 return m_LSL_Functions.llGetOwnerKey(id);
1105 } 1105 }
1106 1106
1107 public LSL_Types.Vector3 llGetCenterOfMass() 1107 public vector llGetCenterOfMass()
1108 { 1108 {
1109 return m_LSL_Functions.llGetCenterOfMass(); 1109 return m_LSL_Functions.llGetCenterOfMass();
1110 } 1110 }
@@ -1142,12 +1142,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1142 return m_LSL_Functions.llList2Key(src, index); 1142 return m_LSL_Functions.llList2Key(src, index);
1143 } 1143 }
1144 1144
1145 public LSL_Types.Vector3 llList2Vector(LSL_Types.list src, int index) 1145 public vector llList2Vector(LSL_Types.list src, int index)
1146 { 1146 {
1147 return m_LSL_Functions.llList2Vector(src, index); 1147 return m_LSL_Functions.llList2Vector(src, index);
1148 } 1148 }
1149 1149
1150 public LSL_Types.Quaternion llList2Rot(LSL_Types.list src, int index) 1150 public rotation llList2Rot(LSL_Types.list src, int index)
1151 { 1151 {
1152 return m_LSL_Functions.llList2Rot(src, index); 1152 return m_LSL_Functions.llList2Rot(src, index);
1153 } 1153 }
@@ -1187,7 +1187,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1187 return m_LSL_Functions.llList2ListStrided(src, start, end, stride); 1187 return m_LSL_Functions.llList2ListStrided(src, start, end, stride);
1188 } 1188 }
1189 1189
1190 public LSL_Types.Vector3 llGetRegionCorner() 1190 public vector llGetRegionCorner()
1191 { 1191 {
1192 return m_LSL_Functions.llGetRegionCorner(); 1192 return m_LSL_Functions.llGetRegionCorner();
1193 } 1193 }
@@ -1217,7 +1217,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1217 return m_LSL_Functions.llGetDate(); 1217 return m_LSL_Functions.llGetDate();
1218 } 1218 }
1219 1219
1220 public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir) 1220 public int llEdgeOfWorld(vector pos, vector dir)
1221 { 1221 {
1222 return m_LSL_Functions.llEdgeOfWorld(pos, dir); 1222 return m_LSL_Functions.llEdgeOfWorld(pos, dir);
1223 } 1223 }
@@ -1255,7 +1255,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1255 m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate); 1255 m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate);
1256 } 1256 }
1257 1257
1258 public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west) 1258 public void llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west)
1259 { 1259 {
1260 m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); 1260 m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west);
1261 } 1261 }
@@ -1275,7 +1275,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1275 return m_LSL_Functions.llOverMyLand(id); 1275 return m_LSL_Functions.llOverMyLand(id);
1276 } 1276 }
1277 1277
1278 public string llGetLandOwnerAt(LSL_Types.Vector3 pos) 1278 public string llGetLandOwnerAt(vector pos)
1279 { 1279 {
1280 return m_LSL_Functions.llGetLandOwnerAt(pos); 1280 return m_LSL_Functions.llGetLandOwnerAt(pos);
1281 } 1281 }
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1285 return m_LSL_Functions.llGetNotecardLine(name, line); 1285 return m_LSL_Functions.llGetNotecardLine(name, line);
1286 } 1286 }
1287 1287
1288 public LSL_Types.Vector3 llGetAgentSize(string id) 1288 public vector llGetAgentSize(string id)
1289 { 1289 {
1290 return m_LSL_Functions.llGetAgentSize(id); 1290 return m_LSL_Functions.llGetAgentSize(id);
1291 } 1291 }
@@ -1300,17 +1300,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1300 m_LSL_Functions.llUnSit(id); 1300 m_LSL_Functions.llUnSit(id);
1301 } 1301 }
1302 1302
1303 public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset) 1303 public vector llGroundSlope(vector offset)
1304 { 1304 {
1305 return m_LSL_Functions.llGroundSlope(offset); 1305 return m_LSL_Functions.llGroundSlope(offset);
1306 } 1306 }
1307 1307
1308 public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset) 1308 public vector llGroundNormal(vector offset)
1309 { 1309 {
1310 return m_LSL_Functions.llGroundNormal(offset); 1310 return m_LSL_Functions.llGroundNormal(offset);
1311 } 1311 }
1312 1312
1313 public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset) 1313 public vector llGroundContour(vector offset)
1314 { 1314 {
1315 return m_LSL_Functions.llGroundContour(offset); 1315 return m_LSL_Functions.llGroundContour(offset);
1316 } 1316 }
@@ -1368,12 +1368,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1368 m_LSL_Functions.llSetVehicledoubleParam(param, value); 1368 m_LSL_Functions.llSetVehicledoubleParam(param, value);
1369 } 1369 }
1370 1370
1371 public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec) 1371 public void llSetVehicleVectorParam(int param, vector vec)
1372 { 1372 {
1373 m_LSL_Functions.llSetVehicleVectorParam(param, vec); 1373 m_LSL_Functions.llSetVehicleVectorParam(param, vec);
1374 } 1374 }
1375 1375
1376 public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot) 1376 public void llSetVehicleRotationParam(int param, rotation rot)
1377 { 1377 {
1378 m_LSL_Functions.llSetVehicleRotationParam(param, rot); 1378 m_LSL_Functions.llSetVehicleRotationParam(param, rot);
1379 } 1379 }
@@ -1388,7 +1388,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1388 m_LSL_Functions.llRemoveVehicleFlags(flags); 1388 m_LSL_Functions.llRemoveVehicleFlags(flags);
1389 } 1389 }
1390 1390
1391 public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot) 1391 public void llSitTarget(vector offset, rotation rot)
1392 { 1392 {
1393 m_LSL_Functions.llSitTarget(offset, rot); 1393 m_LSL_Functions.llSitTarget(offset, rot);
1394 } 1394 }
@@ -1413,12 +1413,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1413 m_LSL_Functions.llSetSitText(text); 1413 m_LSL_Functions.llSetSitText(text);
1414 } 1414 }
1415 1415
1416 public void llSetCameraEyeOffset(LSL_Types.Vector3 offset) 1416 public void llSetCameraEyeOffset(vector offset)
1417 { 1417 {
1418 m_LSL_Functions.llSetCameraEyeOffset(offset); 1418 m_LSL_Functions.llSetCameraEyeOffset(offset);
1419 } 1419 }
1420 1420
1421 public void llSetCameraAtOffset(LSL_Types.Vector3 offset) 1421 public void llSetCameraAtOffset(vector offset)
1422 { 1422 {
1423 m_LSL_Functions.llSetCameraAtOffset(offset); 1423 m_LSL_Functions.llSetCameraAtOffset(offset);
1424 } 1424 }
@@ -1428,7 +1428,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1428 return m_LSL_Functions.llDumpList2String(src, seperator); 1428 return m_LSL_Functions.llDumpList2String(src, seperator);
1429 } 1429 }
1430 1430
1431 public int llScriptDanger(LSL_Types.Vector3 pos) 1431 public int llScriptDanger(vector pos)
1432 { 1432 {
1433 return m_LSL_Functions.llScriptDanger(pos); 1433 return m_LSL_Functions.llScriptDanger(pos);
1434 } 1434 }
@@ -1545,12 +1545,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1545 m_LSL_Functions.llSetParcelMusicURL(url); 1545 m_LSL_Functions.llSetParcelMusicURL(url);
1546 } 1546 }
1547 1547
1548 public LSL_Types.Vector3 llGetRootPosition() 1548 public vector llGetRootPosition()
1549 { 1549 {
1550 return m_LSL_Functions.llGetRootPosition(); 1550 return m_LSL_Functions.llGetRootPosition();
1551 } 1551 }
1552 1552
1553 public LSL_Types.Quaternion llGetRootRotation() 1553 public rotation llGetRootRotation()
1554 { 1554 {
1555 return m_LSL_Functions.llGetRootRotation(); 1555 return m_LSL_Functions.llGetRootRotation();
1556 } 1556 }
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1595 return m_LSL_Functions.llGetBoundingBox(obj); 1595 return m_LSL_Functions.llGetBoundingBox(obj);
1596 } 1596 }
1597 1597
1598 public LSL_Types.Vector3 llGetGeometricCenter() 1598 public vector llGetGeometricCenter()
1599 { 1599 {
1600 return m_LSL_Functions.llGetGeometricCenter(); 1600 return m_LSL_Functions.llGetGeometricCenter();
1601 } 1601 }
@@ -1628,7 +1628,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1628 return m_LSL_Functions.llGetSimulatorHostname(); 1628 return m_LSL_Functions.llGetSimulatorHostname();
1629 } 1629 }
1630 1630
1631 public void llSetLocalRot(LSL_Types.Quaternion rot) 1631 public void llSetLocalRot(rotation rot)
1632 { 1632 {
1633 m_LSL_Functions.llSetLocalRot(rot); 1633 m_LSL_Functions.llSetLocalRot(rot);
1634 } 1634 }
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1638 return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers); 1638 return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers);
1639 } 1639 }
1640 1640
1641 public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param) 1641 public void llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, int param)
1642 { 1642 {
1643 m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); 1643 m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param);
1644 } 1644 }
@@ -1726,12 +1726,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1726 m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); 1726 m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons);
1727 } 1727 }
1728 1728
1729 public LSL_Types.Vector3 llGetCameraPos() 1729 public vector llGetCameraPos()
1730 { 1730 {
1731 return m_LSL_Functions.llGetCameraPos(); 1731 return m_LSL_Functions.llGetCameraPos();
1732 } 1732 }
1733 1733
1734 public LSL_Types.Quaternion llGetCameraRot() 1734 public rotation llGetCameraRot()
1735 { 1735 {
1736 return m_LSL_Functions.llGetCameraRot(); 1736 return m_LSL_Functions.llGetCameraRot();
1737 } 1737 }
@@ -1756,7 +1756,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1756 return m_LSL_Functions.llUnescapeURL(url); 1756 return m_LSL_Functions.llUnescapeURL(url);
1757 } 1757 }
1758 1758
1759 public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at) 1759 public void llMapDestination(string simname, vector pos, vector look_at)
1760 { 1760 {
1761 m_LSL_Functions.llMapDestination(simname, pos, look_at); 1761 m_LSL_Functions.llMapDestination(simname, pos, look_at);
1762 } 1762 }
@@ -1796,7 +1796,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1796 return m_LSL_Functions.llGetUnixTime(); 1796 return m_LSL_Functions.llGetUnixTime();
1797 } 1797 }
1798 1798
1799 public int llGetParcelFlags(LSL_Types.Vector3 pos) 1799 public int llGetParcelFlags(vector pos)
1800 { 1800 {
1801 return m_LSL_Functions.llGetParcelFlags(pos); 1801 return m_LSL_Functions.llGetParcelFlags(pos);
1802 } 1802 }
@@ -1826,12 +1826,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1826 m_LSL_Functions.llResetLandPassList(); 1826 m_LSL_Functions.llResetLandPassList();
1827 } 1827 }
1828 1828
1829 public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide) 1829 public int llGetParcelPrimCount(vector pos, int category, int sim_wide)
1830 { 1830 {
1831 return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); 1831 return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide);
1832 } 1832 }
1833 1833
1834 public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos) 1834 public LSL_Types.list llGetParcelPrimOwners(vector pos)
1835 { 1835 {
1836 return m_LSL_Functions.llGetParcelPrimOwners(pos); 1836 return m_LSL_Functions.llGetParcelPrimOwners(pos);
1837 } 1837 }
@@ -1844,12 +1844,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1844 // 1844 //
1845 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 1845 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
1846 // 1846 //
1847 public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide) 1847 public int llGetParcelMaxPrims(vector pos, int sim_wide)
1848 { 1848 {
1849 return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); 1849 return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide);
1850 } 1850 }
1851 1851
1852 public LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param) 1852 public LSL_Types.list llGetParcelDetails(vector pos, LSL_Types.list param)
1853 { 1853 {
1854 return m_LSL_Functions.llGetParcelDetails(pos, param); 1854 return m_LSL_Functions.llGetParcelDetails(pos, param);
1855 } 1855 }
@@ -2387,7 +2387,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2387 public const int OBJECT_CREATOR = 8; 2387 public const int OBJECT_CREATOR = 8;
2388 2388
2389 // Can not be public const? 2389 // Can not be public const?
2390 public LSL_Types.Vector3 ZERO_VECTOR = new LSL_Types.Vector3(0.0, 0.0, 0.0); 2390 public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
2391 public LSL_Types.Quaternion ZERO_ROTATION = new LSL_Types.Quaternion(0.0, 0, 0.0, 1.0); 2391 public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0);
2392 } 2392 }
2393} 2393}
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 0521df2..76d8d11 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -29,12 +29,13 @@ using System;
29using System.IO; 29using System.IO;
30using log4net.Config; 30using log4net.Config;
31using Nini.Config; 31using Nini.Config;
32using OpenSim;
32using OpenSim.Framework; 33using OpenSim.Framework;
33using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
34using OpenSim.Region.Environment; 35using OpenSim.Region.Environment;
35using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
36 37
37namespace OpenSim.Tools.Export 38namespace OpenSimExport
38{ 39{
39 public class OpenSimExport 40 public class OpenSimExport
40 { 41 {
@@ -108,4 +109,4 @@ namespace OpenSim.Tools.Export
108 return config; 109 return config;
109 } 110 }
110 } 111 }
111} 112} \ No newline at end of file