25 files changed, 85 insertions, 80 deletions

diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index f715129..cabefc9 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 using libsecondlife.Packets;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Inventory

 {

diff --git a/OpenSim.Framework/IAssetServer.cs b/OpenSim.Framework/Interfaces/IAssetServer.cs
index a0de548..3f86acc 100644
--- a/OpenSim.Framework/IAssetServer.cs
+++ b/OpenSim.Framework/Interfaces/IAssetServer.cs
@@ -30,7 +30,7 @@ using System.Net.Sockets;
 using System.IO;

 using System.Threading;

 using libsecondlife;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/IConfig.cs b/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/IConfig.cs
+++ b/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/IGenericConfig.cs b/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/IGenericConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/IGridConfig.cs b/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/IGridConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/IGridServer.cs b/OpenSim.Framework/Interfaces/IGridServer.cs
index 9c06a6b..b01f308 100644
--- a/OpenSim.Framework/IGridServer.cs
+++ b/OpenSim.Framework/Interfaces/IGridServer.cs
@@ -27,13 +27,14 @@
 

 

 using System;

-using System.Collections;
+using System.Collections;

 using System.Collections.Generic;

 using System.Net;

 using System.Net.Sockets;

 using System.IO;

 using libsecondlife;

 using OpenSim;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

@@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
         string GetName();

         bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

         void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

-        void Close();
+        void Close();

     }

     

     public struct UUIDBlock

diff --git a/OpenSim.Framework/ILocalStorage.cs b/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 2c45baa..a4d2ba1 100644
--- a/OpenSim.Framework/ILocalStorage.cs
+++ b/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -27,7 +27,7 @@
 

 using System;

 using libsecondlife;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/IScriptAPI.cs b/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 2f58198..3ad0f06 100644
--- a/OpenSim.Framework/IScriptAPI.cs
+++ b/OpenSim.Framework/Interfaces/IScriptAPI.cs
@@ -1,6 +1,7 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/IScriptEngine.cs b/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/IScriptEngine.cs
+++ b/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/IUserConfig.cs b/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/IUserConfig.cs
+++ b/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/IUserServer.cs b/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/IUserServer.cs
+++ b/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/Interfaces/LocalGridBase.cs
index 6857d6d..c3ab262 100644
--- a/OpenSim.Framework/LocalGridBase.cs
+++ b/OpenSim.Framework/Interfaces/LocalGridBase.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using libsecondlife;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index 0b72b9f..f24ec66 100644
--- a/OpenSim.Framework/RemoteGridBase.cs
+++ b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
@@ -1,8 +1,9 @@
 using System;

-using System.Collections;
+using System.Collections;

 using System.Collections.Generic;

 using System.Text;

 using libsecondlife;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

@@ -22,14 +23,14 @@ namespace OpenSim.Framework.Interfaces
         public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

         public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

         public abstract void Close();

-        public abstract Hashtable GridData {
-                get;
-                set;
-        }
-
-        public abstract ArrayList neighbours {
-                get;
-                set;
-        }
+        public abstract Hashtable GridData {

+                get;

+                set;

+        }

+

+        public abstract ArrayList neighbours {

+                get;

+                set;

+        }

     }

 }

diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 68b7ef0..ea4817e 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -78,91 +78,91 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="AgentCiruitData.cs">

+    <Compile Include="AgentInventory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AgentInventory.cs">

+    <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AssetBase.cs">

+    <Compile Include="HeightMapGenHills.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="BlockingQueue.cs">

+    <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="HeightMapGenHills.cs">

+    <Compile Include="SimProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IAssetServer.cs">

+    <Compile Include="SimProfileBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IConfig.cs">

+    <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IGenericConfig.cs">

+    <Compile Include="UserProfileManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IGridConfig.cs">

+    <Compile Include="UserProfileManagerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IGridServer.cs">

+    <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ILocalStorage.cs">

+    <Compile Include="Interfaces\IAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IScriptAPI.cs">

+    <Compile Include="Interfaces\IConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IScriptEngine.cs">

+    <Compile Include="Interfaces\IGenericConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IUserConfig.cs">

+    <Compile Include="Interfaces\IGridConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IUserServer.cs">

+    <Compile Include="Interfaces\IGridServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalGridBase.cs">

+    <Compile Include="Interfaces\ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Login.cs">

+    <Compile Include="Interfaces\IScriptAPI.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LoginService.cs">

+    <Compile Include="Interfaces\IScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="NeighbourInfo.cs">

+    <Compile Include="Interfaces\IUserConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OSVector3.cs">

+    <Compile Include="Interfaces\IUserServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PrimData.cs">

+    <Compile Include="Interfaces\LocalGridBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RemoteGridBase.cs">

+    <Compile Include="Interfaces\RemoteGridBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfile.cs">

+    <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfileBase.cs">

+    <Compile Include="Types\AgentCiruitData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfile.cs">

+    <Compile Include="Types\AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfileManager.cs">

+    <Compile Include="Types\Login.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfileManagerBase.cs">

+    <Compile Include="Types\NeighbourInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Util.cs">

+    <Compile Include="Types\OSVector3.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

+    <Compile Include="Types\PrimData.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index fb7fbd4..8048de5 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,35 +11,35 @@
             <resources prefix="OpenSim.Framework" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="AgentCiruitData.cs" />

                 <include name="AgentInventory.cs" />

-                <include name="AssetBase.cs" />

                 <include name="BlockingQueue.cs" />

                 <include name="HeightMapGenHills.cs" />

-                <include name="IAssetServer.cs" />

-                <include name="IConfig.cs" />

-                <include name="IGenericConfig.cs" />

-                <include name="IGridConfig.cs" />

-                <include name="IGridServer.cs" />

-                <include name="ILocalStorage.cs" />

-                <include name="IScriptAPI.cs" />

-                <include name="IScriptEngine.cs" />

-                <include name="IUserConfig.cs" />

-                <include name="IUserServer.cs" />

-                <include name="LocalGridBase.cs" />

-                <include name="Login.cs" />

                 <include name="LoginService.cs" />

-                <include name="NeighbourInfo.cs" />

-                <include name="OSVector3.cs" />

-                <include name="PrimData.cs" />

-                <include name="RemoteGridBase.cs" />

                 <include name="SimProfile.cs" />

                 <include name="SimProfileBase.cs" />

                 <include name="UserProfile.cs" />

                 <include name="UserProfileManager.cs" />

                 <include name="UserProfileManagerBase.cs" />

                 <include name="Util.cs" />

+                <include name="Interfaces/IAssetServer.cs" />

+                <include name="Interfaces/IConfig.cs" />

+                <include name="Interfaces/IGenericConfig.cs" />

+                <include name="Interfaces/IGridConfig.cs" />

+                <include name="Interfaces/IGridServer.cs" />

+                <include name="Interfaces/ILocalStorage.cs" />

+                <include name="Interfaces/IScriptAPI.cs" />

+                <include name="Interfaces/IScriptEngine.cs" />

+                <include name="Interfaces/IUserConfig.cs" />

+                <include name="Interfaces/IUserServer.cs" />

+                <include name="Interfaces/LocalGridBase.cs" />

+                <include name="Interfaces/RemoteGridBase.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

+                <include name="Types/AgentCiruitData.cs" />

+                <include name="Types/AssetBase.cs" />

+                <include name="Types/Login.cs" />

+                <include name="Types/NeighbourInfo.cs" />

+                <include name="Types/OSVector3.cs" />

+                <include name="Types/PrimData.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ad3e028..8acb20b 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Sims
             }

             return this;

         }

-
+

         public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)

         {

             try

@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Sims
             }

             return this;

         }

-
+

 

         public SimProfile()

         {

diff --git a/OpenSim.Framework/AgentCiruitData.cs b/OpenSim.Framework/Types/AgentCiruitData.cs
index e1a79b9..555b3b9 100644
--- a/OpenSim.Framework/AgentCiruitData.cs
+++ b/OpenSim.Framework/Types/AgentCiruitData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Framework.Interfaces

+namespace OpenSim.Framework.Types

 {

     public class AgentCircuitData

     {

@@ -11,7 +11,7 @@ namespace OpenSim.Framework.Interfaces
         public LLUUID AgentID;

         public LLUUID SessionID;

         public LLUUID SecureSessionID;

-        public LLVector3 startpos;
+        public LLVector3 startpos;

         public string firstname;

         public string lastname;

         public uint circuitcode;

diff --git a/OpenSim.Framework/AssetBase.cs b/OpenSim.Framework/Types/AssetBase.cs
index 8206b30..f6104f8 100644
--- a/OpenSim.Framework/AssetBase.cs
+++ b/OpenSim.Framework/Types/AssetBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Framework.Assets

+namespace OpenSim.Framework.Types

 {

     public class AssetBase

     {

diff --git a/OpenSim.Framework/Login.cs b/OpenSim.Framework/Types/Login.cs
index 8a67853..ed77a46 100644
--- a/OpenSim.Framework/Login.cs
+++ b/OpenSim.Framework/Types/Login.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Framework.Interfaces

+namespace OpenSim.Framework.Types

 {

     public class Login

     {

diff --git a/OpenSim.Framework/NeighbourInfo.cs b/OpenSim.Framework/Types/NeighbourInfo.cs
index 8b4fa64..58b6cb1 100644
--- a/OpenSim.Framework/NeighbourInfo.cs
+++ b/OpenSim.Framework/Types/NeighbourInfo.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Framework.Interfaces

+namespace OpenSim.Framework.Types

 {

     public class NeighbourInfo

     {

diff --git a/OpenSim.Framework/OSVector3.cs b/OpenSim.Framework/Types/OSVector3.cs
index b5d1223..8fb840b 100644
--- a/OpenSim.Framework/OSVector3.cs
+++ b/OpenSim.Framework/Types/OSVector3.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Framework

+namespace OpenSim.Framework.Types

 {

     public class OSVector3

     {

diff --git a/OpenSim.Framework/PrimData.cs b/OpenSim.Framework/Types/PrimData.cs
index ee4188d..9b41a12 100644
--- a/OpenSim.Framework/PrimData.cs
+++ b/OpenSim.Framework/Types/PrimData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Framework.Assets

+namespace OpenSim.Framework.Types

 {

     public class PrimData

     {

diff --git a/OpenSim.Framework/UserProfile.cs b/OpenSim.Framework/UserProfile.cs
index 04e9fd5..5b7405a 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim.Framework/UserProfile.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.User
             Circuits = new Dictionary<LLUUID, uint>();

             Inventory = new AgentInventory();

             homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));

-            homepos = new LLVector3();
+            homepos = new LLVector3();

             homelookat = new LLVector3();

         }

 

diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 33f2abd..eb8b7cd 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.User
 

                     LLUUID AgentID = TheUser.UUID;

                     TheUser.InitSessionData();

-
+

                     //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)

                    //SimProfile SimInfo = new SimProfile();

                     //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);

@@ -140,7 +140,7 @@ namespace OpenSim.Framework.User
 

                     ArrayList AgentInventory = new ArrayList();

                     Console.WriteLine("adding inventory to response");

-                    Hashtable TempHash;
+                    Hashtable TempHash;

                     foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)

                     {

                         TempHash = new Hashtable();

@@ -200,7 +200,7 @@ namespace OpenSim.Framework.User
 

                     this.CustomiseResponse(ref responseData, TheUser);

                     response.Value = responseData;

- //                   TheUser.SendDataToSim(SimInfo);
+ //                   TheUser.SendDataToSim(SimInfo);

                     return response;

 

                 }

@@ -211,7 +211,7 @@ namespace OpenSim.Framework.User
                 //}

             }

             return response;

-
+

         }

 

         private static XmlRpcResponse CreateErrorConnectingToGridResponse()

@@ -258,9 +258,9 @@ namespace OpenSim.Framework.User
             SimParams["firstname"] = theUser.firstname;

             SimParams["lastname"] = theUser.lastname;

             SimParams["agent_id"] = theUser.UUID.ToString();

-            SimParams["circuit_code"] = (Int32)circode;
-            SimParams["startpos_x"] = theUser.homepos.X.ToString();
-            SimParams["startpos_y"] = theUser.homepos.Y.ToString();
+            SimParams["circuit_code"] = (Int32)circode;

+            SimParams["startpos_x"] = theUser.homepos.X.ToString();

+            SimParams["startpos_y"] = theUser.homepos.Y.ToString();

             SimParams["startpos_z"] = theUser.homepos.Z.ToString();

             ArrayList SendParams = new ArrayList();

             SendParams.Add(SimParams);

diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/OpenSim.Framework/UserProfileManagerBase.cs
index c9fbf4c..d1307a5 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/OpenSim.Framework/UserProfileManagerBase.cs
@@ -103,7 +103,8 @@ namespace OpenSim.Framework.User
             newprofile.firstname = firstname;

             newprofile.lastname = lastname;

             newprofile.MD5passwd = MD5passwd;

-            newprofile.UUID = LLUUID.Random();
     newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
+            newprofile.UUID = LLUUID.Random();

+            newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);

             this.UserProfiles.Add(newprofile.UUID, newprofile);

             return newprofile;

         }