Parcel Manager Changes:

*Added Parcel Backup Support for DB4. Other storages currently do not save 
*Added parcelIDList in ParcelManager to speed up parcel fetching at position
*Added ParcelData.cs and ParcelData class for better storage support
*Documentation for parcel added
*2 Parcel Related bug fixes

3 files changed, 67 insertions, 15 deletions

diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..9fa3a00 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -37,11 +37,17 @@ 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 LoadParcels(ILocalStorageParcelReceiver recv);

+

         void ShutDown();

     }

 

@@ -49,6 +55,11 @@ 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 f58a2d7..38245f7 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,22 +61,23 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -80,7 +87,7 @@
       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -105,6 +112,7 @@
     <Compile Include="SimProfileBase.cs">

       <SubType>Code</SubType>

     </Compile>

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

     <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -191,4 +199,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs
new file mode 100644
index 0000000..b16926e
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/ParcelData.cs
@@ -0,0 +1,33 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+

+namespace OpenSim.Framework.Types

+{

+    

+        public class ParcelData

+        {

+            public byte[] parcelBitmapByteArray = new byte[512];

+            public string parcelName = "";

+            public string parcelDesc = "";

+            public LLUUID ownerID = new LLUUID();

+            public bool isGroupOwned = false;

+            public LLVector3 AABBMin = new LLVector3();

+            public LLVector3 AABBMax = new LLVector3();

+            public int area = 0;

+            public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned

+            public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID

+            public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category

+            public int claimDate = 0; //Unemplemented

+            public int claimPrice = 0; //Unemplemented

+            public LLUUID groupID = new LLUUID(); //Unemplemented

+            public int groupPrims = 0; //Unemplemented

+            public int salePrice = 0; //Unemeplemented. Parcels price.

+            public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None;

+            public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;

+

+            public int localID = 0;

+        }

+    

+}