*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

2 files changed, 34 insertions, 12 deletions

diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
+++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.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/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 11eca0f..ee8b9ff 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -1,5 +1,6 @@
 /*

-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/

+* Copyright (c) Contributors, http://www.openmetaverse.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

@@ -8,14 +9,14 @@
 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the <organization> nor the

+*     * Neither the name of the OpenSim Project nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY

+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY

+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

@@ -36,7 +37,6 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

-

 namespace OpenSim.Storage.LocalStorageSQLite

 {

     public class SQLiteLocalStorage : ILocalStorage

@@ -54,8 +54,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :Constructor - Exception occured");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");

+                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());

             }

         }

 

@@ -117,8 +117,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :StorePrim - Exception occured");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");

+                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());

             }

 

             cmd.Dispose();

@@ -144,8 +144,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :RemovePrim - Exception occured");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");

+                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());

             }

 

             cmd.Dispose();

@@ -167,6 +167,28 @@ namespace OpenSim.Storage.LocalStorageSQLite
 

         }

 

+        public void SaveParcels(ParcelData[] parcel_manager)

+        {

+

+        }

+

+        public void SaveParcel(ParcelData parcel)

+        {

+        }

+

+        public void RemoveParcel(ParcelData parcel)

+        {

+        }

+

+        public void RemoveAllParcels()

+        {

+        }

+

+        public void LoadParcels(ILocalStorageParcelReceiver recv)

+        {

+            recv.NoParcelDataFromStorage();

+        }

+

         public void ShutDown()

         {

             db.Close();