*Merged EstateManager, EstateSettings, ParcelManager,Parcel, and ParcelData classes

*Incorporated EstateSettings into the RegionInfo class
*Next step is to load from db, save to db the parcel and estate settings

7 files changed, 51 insertions, 56 deletions

diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
+++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath>

+    <ReferencePath>C:\sugilite\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 810345f..3eed2b8 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -29,6 +29,11 @@ namespace OpenSim.Framework.Interfaces
     public delegate void StatusChange(bool status);

     public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);

 

+    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);

+    public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);

+    public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);

+    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); // NOTETOSELFremove the packet part

+

     public interface IClientAPI

     {

         event ChatFromViewer OnChatFromViewer;

@@ -81,7 +86,6 @@ namespace OpenSim.Framework.Interfaces
         void SendWearables(AvatarWearable[] wearables);

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendLayerData(float[] map);

-        void SendRegionHandshake(RegionInfo regionInfo);

         void MoveAgentIntoRegion(RegionInfo regInfo);

         void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);

         void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);

diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..7307966 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -37,11 +37,20 @@ namespace OpenSim.Framework.Interfaces
     public interface ILocalStorage

     {

         void Initialise(string datastore);

+

         void StorePrim(PrimData prim);

         void RemovePrim(LLUUID primID);

         void LoadPrimitives(ILocalStorageReceiver receiver);

+

         float[] LoadWorld();

         void SaveMap(float[] heightmap);

+

+        void SaveParcels(ParcelData[] parcels);

+        void SaveParcel(ParcelData parcel);

+        void RemoveParcel(ParcelData parcel);

+        void RemoveAllParcels();

+        void LoadParcels(ILocalStorageParcelReceiver recv);

+

         void ShutDown();

     }

 

@@ -50,5 +59,10 @@ namespace OpenSim.Framework.Interfaces
         void PrimFromStorage(PrimData prim);

     }

 

+    public interface ILocalStorageParcelReceiver

+    {

+        void ParcelFromStorage(ParcelData data);

+        void NoParcelDataFromStorage();

+    }

 }

 

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 39ce0ff..ab29d04 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -144,15 +144,15 @@
     <Compile Include="Interfaces\IWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IClientAPI.cs">

-      <SubType>Code</SubType>

-    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -195,7 +195,7 @@
     <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

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

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\AgentWearable.cs">

@@ -207,6 +207,9 @@
     <Compile Include="Types\AssetStorage.cs">

       <SubType>Code</SubType>

     </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -222,10 +225,7 @@
     <Compile Include="Types\AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Types\EstateSettings.cs">

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

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath>

+    <ReferencePath>C:\sugilite\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index a75388f..a45a121 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -29,9 +29,9 @@
                 <include name="Interfaces/IUserServer.cs" />

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

                 <include name="Interfaces/IWorld.cs" />

-                <include name="Interfaces/IClientAPI.cs" />

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

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

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

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

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

                 <include name="Interfaces/Remoting/IProxyServerHost.cs" />

@@ -46,17 +46,17 @@
                 <include name="Properties/AssemblyInfo.cs" />

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

                 <include name="Types/NetworkServersInfo.cs" />

-                <include name="Types/RegionInfo.cs" />

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

                 <include name="Types/AgentWearable.cs" />

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

                 <include name="Types/AssetStorage.cs" />

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

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

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

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

                 <include name="Types/AssetLandmark.cs" />

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

-                <include name="Types/ParcelData.cs" />

-                <include name="Types/EstateSettings.cs" />

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

             </sources>

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

                 <lib>

diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs
index fd3b24f..7fa7fe2 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/Common/OpenSim.Framework/Types/RegionInfo.cs
@@ -10,47 +10,24 @@ namespace OpenSim.Framework.Types
 {

     public class RegionInfo

     {

-        public LLUUID SimUUID;

-        public string RegionName;

-        public uint RegionLocX;

-        public uint RegionLocY;

-        public ulong RegionHandle;

-        public ushort RegionWaterHeight = 20;

-        public bool RegionTerraform = true;

-

-        public int IPListenPort;

-        public string IPListenAddr;

-

-        private bool isSandbox;

-        public string DataStore;

-

-        // Region Information

-        // Low resolution 'base' textures. No longer used.

-        public LLUUID TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default

-        public LLUUID TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default

-        public LLUUID TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default

-        public LLUUID TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default

-        // Higher resolution terrain textures

-        public LLUUID TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        public LLUUID TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");

-        // First quad - each point is bilinearly interpolated at each meter of terrain

-        public float TerrainStartHeight00 = 10.0f;       // NW Corner ( I think )

-        public float TerrainStartHeight01 = 10.0f;       // NE Corner ( I think )

-        public float TerrainStartHeight10 = 10.0f;       // SW Corner ( I think )

-        public float TerrainStartHeight11 = 10.0f;       // SE Corner ( I think )

-        // Second quad - also bilinearly interpolated.

-        // Terrain texturing is done that:

-        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]

-        public float TerrainHeightRange00 = 60.0f;

-        public float TerrainHeightRange01 = 60.0f;

-        public float TerrainHeightRange10 = 60.0f;

-        public float TerrainHeightRange11 = 60.0f;

-

-        // Terrain Default (Must be in F32 Format!)

-        public string TerrainFile = "default.r32";

-        public double TerrainMultiplier = 60.0;

+        public LLUUID SimUUID = new LLUUID();

+        public string RegionName = "";

+        public uint RegionLocX = 0;

+        public uint RegionLocY = 0;

+        public ulong RegionHandle = 0;

+

+        public string DataStore = "";

+        public bool isSandbox = false;

+

+        public LLUUID MasterAvatarAssignedUUID = new LLUUID();

+        public string MasterAvatarFirstName = "";

+        public string MasterAvatarLastName = "";

+

+        public int IPListenPort = 0;

+        public string IPListenAddr = "";

+

+

+        public EstateSettings estateSettings;

 

         public RegionInfo()

         {