*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
author: mingchen 2007-06-08 19:10:55 +0000
committer: mingchen 2007-06-08 19:10:55 +0000
commit: 2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch)
tree: bd07f5ddd43dc11077dc445d7b50a983ed37535f
parent: *Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff)
download: opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.zip
opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.gz
opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.bz2
opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.xz
77 files changed, 1901 insertions, 1275 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">
+    <Compile Include="Types\RegionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\EstateSettings.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/RegionInfo.cs" />
-                <include name="Types/EstateSettings.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 LLUUID SimUUID = new LLUUID();
-        public string RegionName;
+        public string RegionName = "";
-        public uint RegionLocX;
+        public uint RegionLocX = 0;
-        public uint RegionLocY;
+        public uint RegionLocY = 0;
-        public ulong RegionHandle;
+        public ulong RegionHandle = 0;
-        public ushort RegionWaterHeight = 20;
-        public bool RegionTerraform = true;
+        public string DataStore = "";
+        public bool isSandbox = false;
-        public int IPListenPort;
-        public string IPListenAddr;
+        public LLUUID MasterAvatarAssignedUUID = new LLUUID();
+        public string MasterAvatarFirstName = "";
-        private bool isSandbox;
+        public string MasterAvatarLastName = "";
-        public string DataStore;
+        public int IPListenPort = 0;
-        // Region Information
+        public string IPListenAddr = "";
-        // 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 EstateSettings estateSettings;
-        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 RegionInfo()
        {
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
+++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.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.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index e89a62c..6768ce4 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,13 +92,13 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="BaseHttpServer.cs">
+    <Compile Include="LoginServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="BaseServer.cs">
+    <Compile Include="BaseHttpServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="BaseServer.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="IRestHandler.cs">
@@ -107,16 +107,16 @@
    <Compile Include="LocalUserProfileManager.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LoginResponse.cs">
+    <Compile Include="XmlRpcMethod.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LoginServer.cs">
+    <Compile Include="LoginResponse.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UDPServerBase.cs">
+    <Compile Include="CheckSumServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="UDPServerBase.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
+++ b/Common/OpenSim.Servers/OpenSim.Servers.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.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index 41c1350..a2af584 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,15 @@
            <resources prefix="OpenSim.Servers" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
+                <include name="LoginServer.cs" />
                <include name="BaseHttpServer.cs" />
                <include name="BaseServer.cs" />
-                <include name="CheckSumServer.cs" />
                <include name="IRestHandler.cs" />
                <include name="LocalUserProfileManager.cs" />
+                <include name="XmlRpcMethod.cs" />
                <include name="LoginResponse.cs" />
-                <include name="LoginServer.cs" />
+                <include name="CheckSumServer.cs" />
                <include name="UDPServerBase.cs" />
-                <include name="XmlRpcMethod.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 61f8be0..1ab494e 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
  <ItemGroup>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Logger.cs">
+    <Compile Include="XmlRpcBoxcarRequest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="SimpleHttpRequest.cs">
+    <Compile Include="XmlRpcRequest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcBoxcarRequest.cs">
+    <Compile Include="XmlRpcResponseSerializer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcClientProxy.cs">
+    <Compile Include="Logger.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcDeserializer.cs">
+    <Compile Include="XmlRpcRequestDeserializer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcErrorCodes.cs">
+    <Compile Include="XmlRpcExposedAttribute.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcException.cs">
+    <Compile Include="XmlRpcResponse.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcExposedAttribute.cs">
+    <Compile Include="XmlRpcException.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcRequest.cs">
+    <Compile Include="XmlRpcResponder.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcRequestDeserializer.cs">
+    <Compile Include="XmlRpcResponseDeserializer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcRequestSerializer.cs">
+    <Compile Include="XmlRpcServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcResponder.cs">
+    <Compile Include="XmlRpcErrorCodes.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcResponse.cs">
+    <Compile Include="XmlRpcSerializer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcResponseDeserializer.cs">
+    <Compile Include="XmlRpcSystemObject.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcResponseSerializer.cs">
+    <Compile Include="SimpleHttpRequest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcSerializer.cs">
+    <Compile Include="XmlRpcClientProxy.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcServer.cs">
+    <Compile Include="XmlRpcRequestSerializer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="XmlRpcSystemObject.cs">
+    <Compile Include="XmlRpcDeserializer.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="XmlRpcXmlTokens.cs">
diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj.user
+++ b/Common/XmlRpcCS/XMLRPC.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/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 2eabfcd..e7936c3 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
            <resources prefix="XMLRPC" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="Logger.cs" />
-                <include name="SimpleHttpRequest.cs" />
                <include name="XmlRpcBoxcarRequest.cs" />
-                <include name="XmlRpcClientProxy.cs" />
-                <include name="XmlRpcDeserializer.cs" />
-                <include name="XmlRpcErrorCodes.cs" />
-                <include name="XmlRpcException.cs" />
-                <include name="XmlRpcExposedAttribute.cs" />
                <include name="XmlRpcRequest.cs" />
+                <include name="XmlRpcResponseSerializer.cs" />
+                <include name="Logger.cs" />
                <include name="XmlRpcRequestDeserializer.cs" />
-                <include name="XmlRpcRequestSerializer.cs" />
+                <include name="XmlRpcExposedAttribute.cs" />
-                <include name="XmlRpcResponder.cs" />
                <include name="XmlRpcResponse.cs" />
+                <include name="XmlRpcException.cs" />
+                <include name="XmlRpcResponder.cs" />
                <include name="XmlRpcResponseDeserializer.cs" />
-                <include name="XmlRpcResponseSerializer.cs" />
-                <include name="XmlRpcSerializer.cs" />
                <include name="XmlRpcServer.cs" />
+                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcSerializer.cs" />
                <include name="XmlRpcSystemObject.cs" />
+                <include name="SimpleHttpRequest.cs" />
+                <include name="XmlRpcClientProxy.cs" />
+                <include name="XmlRpcRequestSerializer.cs" />
+                <include name="XmlRpcDeserializer.cs" />
                <include name="XmlRpcXmlTokens.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 6ced216..3b783ca 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
@@ -1,116 +1,3 @@
-<<<<<<< .mine
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-=======
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -222,4 +109,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index 351de2a..5fe0cf7 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -1,122 +1,3 @@
-<<<<<<< .mine
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.MySQL</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MySql.Data.dll" >
-      <HintPath>..\..\bin\MySql.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLInventoryData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLLogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-=======
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -234,4 +115,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index 4360031..fa17367 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -1,113 +1,3 @@
-<<<<<<< .mine
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1E3F341A-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.SQLite</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.SQLite</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.SQLite.dll" >
-      <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="SQLiteGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SQLiteManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-=======
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -216,4 +106,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index c0684a2..990cd16 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -1,118 +1,3 @@
-<<<<<<< .mine
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ILogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IniConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InventoryData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-=======
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -226,4 +111,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
index dad56cb..ea7548a 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
@@ -62,12 +62,12 @@
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Framework.dll" >
+    <Reference Include="OpenSim.Framework" >
-      <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
+      <HintPath>OpenSim.Framework.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers.dll" >
+    <Reference Include="OpenSim.Servers" >
-      <HintPath>..\..\bin\OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index 53afe16..a281e4f 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -79,133 +78,6 @@
      <HintPath>OpenSim.Framework.Console.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.GridInterfaces.Local" >
-      <HintPath>OpenSim.GridInterfaces.Local.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC" >
-      <HintPath>XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssetHttpServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Main.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
-=======
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0021261B-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.AssetServer</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.AssetServer</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework" >
-      <HintPath>OpenSim.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework.Console" >
-      <HintPath>OpenSim.Framework.Console.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GridInterfaces.Local" >
-      <HintPath>OpenSim.GridInterfaces.Local.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="OpenSim.Servers" >
      <HintPath>OpenSim.Servers.dll</HintPath>
      <Private>False</Private>
@@ -244,4 +116,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .r921
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index 0da1d34..700e32b 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -25,7 +25,6 @@
                <include name="System.Xml.dll" />
                <include name="../../bin/OpenSim.Framework.dll" />
                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.GridInterfaces.Local.dll" />
                <include name="../../bin/OpenSim.Servers.dll" />
                <include name="../../bin/libsecondlife.dll" />
                <include name="../../bin/Db4objects.Db4o.dll" />
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
index 0b89633..54d31b2 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ b/OpenGridServices/ServiceManager/ServiceManager.csproj
@@ -1,107 +1,3 @@
-<<<<<<< .mine
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>ServiceManager</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
-    <RootNamespace>ServiceManager</RootNamespace>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.ServiceProcess">
-      <HintPath>System.ServiceProcess.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml">
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll">
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml">
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ServiceManager.cs">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>=======
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -174,18 +70,6 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework.dll" >
-      <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
  </ItemGroup>
@@ -202,4 +86,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .r921
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.user b/OpenGridServices/ServiceManager/ServiceManager.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj.user
+++ b/OpenGridServices/ServiceManager/ServiceManager.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\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>
diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
index 5e1dd72..163e086 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build
@@ -21,9 +21,6 @@
                <include name="System.dll" />
                <include name="System.ServiceProcess.dll" />
                <include name="System.Xml.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.build b/OpenSim.build
index 51168a1..a600918 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -46,10 +46,12 @@
        <echo message="Deleting all builds from all configurations" />
        <delete dir="${bin.dir}" failonerror="false" />
        <delete dir="${obj.dir}" failonerror="false" />
+        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
+        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" />
+        <nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="clean" />
        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" />
        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
@@ -71,6 +73,7 @@
        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="build" />
+        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="build" />
        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
@@ -84,6 +87,7 @@
        <nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" />
        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
+        <nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="build" />
        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />
    </target>
@@ -95,10 +99,12 @@
    <target name="doc" depends="build-release">
        <echo message="Generating all documentation from all builds" />
+        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
+        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" />
+        <nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="doc" />
        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" />
        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
diff --git a/OpenSim.sln b/OpenSim.sln
index d2036f0..33a7217 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@@ -41,93 +41,144 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
 EndProject
 Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
+    Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
+    Release|Any CPU = Release|Any CPU
-        EndGlobalSection
+  EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+  GlobalSection(ProjectDependencies) = postSolution
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})
-                {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})
-                {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000})
-                {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
-                {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+  EndGlobalSection
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        EndGlobalSection
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        GlobalSection(SolutionProperties) = preSolution
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                HideSolutionNode = FALSE
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim.suo b/OpenSim.suo
index 9f36e20..8f2c6c9 100644
--- a/OpenSim.suo
+++ b/OpenSim.suo
Binary files differ
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
+++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.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.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.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.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
+++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.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.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
+++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.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.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
+++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.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.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.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.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 89c1f61..dd9adac 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -235,49 +235,6 @@ namespace OpenSim
            }
        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        public void SendRegionHandshake(RegionInfo regionInfo)
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
-            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-            RegionHandshakePacket handshake = new RegionHandshakePacket();
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
-            handshake.RegionInfo.BillableFactor = 0;
-            handshake.RegionInfo.IsEstateManager = false;
-            handshake.RegionInfo.TerrainHeightRange00 = regionInfo.TerrainHeightRange00;
-            handshake.RegionInfo.TerrainHeightRange01 = regionInfo.TerrainHeightRange01;
-            handshake.RegionInfo.TerrainHeightRange10 = regionInfo.TerrainHeightRange10;
-            handshake.RegionInfo.TerrainHeightRange11 = regionInfo.TerrainHeightRange11;
-            handshake.RegionInfo.TerrainStartHeight00 = regionInfo.TerrainStartHeight00;
-            handshake.RegionInfo.TerrainStartHeight01 = regionInfo.TerrainStartHeight01;
-            handshake.RegionInfo.TerrainStartHeight10 = regionInfo.TerrainStartHeight10;
-            handshake.RegionInfo.TerrainStartHeight11 = regionInfo.TerrainStartHeight11;
-            handshake.RegionInfo.SimAccess = 13;
-            handshake.RegionInfo.WaterHeight = regionInfo.RegionWaterHeight;
-            uint regionFlags = 72458694;
-            if (regionInfo.RegionTerraform)
-            {
-                regionFlags -= 64;
-            }
-            handshake.RegionInfo.RegionFlags = regionFlags;
-            handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0");
-            handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
-            handshake.RegionInfo.TerrainBase0 = regionInfo.TerrainBase0;
-            handshake.RegionInfo.TerrainBase1 = regionInfo.TerrainBase1;
-            handshake.RegionInfo.TerrainBase2 = regionInfo.TerrainBase2;
-            handshake.RegionInfo.TerrainBase3 = regionInfo.TerrainBase3;
-            handshake.RegionInfo.TerrainDetail0 = regionInfo.TerrainDetail0;
-            handshake.RegionInfo.TerrainDetail1 = regionInfo.TerrainDetail1;
-            handshake.RegionInfo.TerrainDetail2 = regionInfo.TerrainDetail2;
-            handshake.RegionInfo.TerrainDetail3 = regionInfo.TerrainDetail3;
-            handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
-            OutPacket(handshake);
-        }
        /// <summary>
        /// 
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 990b5c3..fa91d7d 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,7 +124,10 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="AgentAssetUpload.cs">
+    <Compile Include="NetworkServersInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UDPServer.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="AuthenticateSessionsLocal.cs">
@@ -133,10 +136,10 @@
    <Compile Include="AuthenticateSessionsRemote.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="OpenSimNetworkHandler.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UserConfigUtility.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="ClientView.Grid.cs">
@@ -148,40 +151,37 @@
    <Compile Include="ClientView.ProcessPackets.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CommsManager.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="NetworkServersInfo.cs">
+    <Compile Include="AgentAssetUpload.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="OpenSimNetworkHandler.cs">
+    <Compile Include="ClientViewBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="RegionServerBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="RegionServerBase.cs">
+    <Compile Include="CommsManager.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UserConfigUtility.cs">
+    <Compile Include="PacketServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="ClientView.API.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Assets\AssetCache.cs">
+    <Compile Include="CAPS\AdminWebFront.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Assets\InventoryCache.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="CAPS\AdminWebFront.cs">
+    <Compile Include="Assets\AssetCache.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.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.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index c984f5a..fc33eb9 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,47 +11,26 @@
            <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="AgentAssetUpload.cs" />
+                <include name="NetworkServersInfo.cs" />
-                <include name="AuthenticateSessionsBase.cs" />
+                <include name="UDPServer.cs" />
                <include name="AuthenticateSessionsLocal.cs" />
                <include name="AuthenticateSessionsRemote.cs" />
-                <include name="ClientView.cs" />
+                <include name="OpenSimNetworkHandler.cs" />
+                <include name="UserConfigUtility.cs" />
                <include name="ClientView.Grid.cs" />
                <include name="ClientView.PacketHandlers.cs" />
                <include name="ClientView.ProcessPackets.cs" />
+                <include name="VersionInfo.cs" />
+                <include name="AgentAssetUpload.cs" />
                <include name="ClientViewBase.cs" />
-                <include name="Grid.cs" />
-                <include name="OpenSimMain.cs" />
-                <include name="OpenSimNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
-                <include name="RegionInfo.cs" />
-                <include name="RegionInfoBase.cs" />
                <include name="RegionServerBase.cs" />
-                <include name="UDPServer.cs" />
+                <include name="CommsManager.cs" />
-                <include name="VersionInfo.cs" />
+                <include name="ClientView.cs" />
-                <include name="Assets/AssetCache.cs" />
+                <include name="PacketServer.cs" />
-                <include name="Assets/InventoryCache.cs" />
+                <include name="ClientView.API.cs" />
                <include name="CAPS/AdminWebFront.cs" />
-                <include name="types/Mesh.cs" />
+                <include name="Assets/InventoryCache.cs" />
-                <include name="types/Triangle.cs" />
+                <include name="Assets/AssetCache.cs" />
-                <include name="world/Avatar.Client.cs" />
-                <include name="world/Avatar.cs" />
-                <include name="world/Avatar.Update.cs" />
-                <include name="world/AvatarAnimations.cs" />
-                <include name="world/Entity.cs" />
-                <include name="world/Primitive.cs" />
-                <include name="world/Primitive2.cs" />
-                <include name="world/SceneObject.cs" />
-                <include name="world/World.cs" />
-                <include name="world/World.PacketHandlers.cs" />
-                <include name="world/World.Scripting.cs" />
-                <include name="world/WorldBase.cs" />
-                <include name="world/scripting/IScriptContext.cs" />
-                <include name="world/scripting/IScriptEntity.cs" />
-                <include name="world/scripting/IScriptHandler.cs" />
-                <include name="world/scripting/Script.cs" />
-                <include name="world/scripting/ScriptFactory.cs" />
-                <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index bd1a332..6ffcf9e 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -76,66 +76,66 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="ClassInstance.cs">
+    <Compile Include="MainMemory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClassRecord.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Heap.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interpreter.cs">
+    <Compile Include="StackFrame.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="InterpreterLogic.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="InterpreterMethods.cs">
+    <Compile Include="OpenSimJVM.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="InterpreterReturn.cs">
+    <Compile Include="InterpreterMethods.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="MainMemory.cs">
+    <Compile Include="ClassInstance.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="MethodMemory.cs">
+    <Compile Include="InterpreterReturn.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Object.cs">
+    <Compile Include="Interpreter.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="OpenSimJVM.cs">
+    <Compile Include="ClassRecord.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Stack.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="StackFrame.cs">
+    <Compile Include="Object.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Thread.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="MethodMemory.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\ArrayReference.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Types\BaseType.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\ObjectReference.cs">
+    <Compile Include="Types\ArrayReference.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+    <Compile Include="Types\ObjectReference.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Types\PrimitiveTypes\Char.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Types\PrimitiveTypes\Float.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.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.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index c5255db..ac4d564 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
            <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="ClassInstance.cs" />
+                <include name="MainMemory.cs" />
-                <include name="ClassRecord.cs" />
                <include name="Heap.cs" />
-                <include name="Interpreter.cs" />
+                <include name="StackFrame.cs" />
                <include name="InterpreterLogic.cs" />
+                <include name="OpenSimJVM.cs" />
                <include name="InterpreterMethods.cs" />
+                <include name="ClassInstance.cs" />
                <include name="InterpreterReturn.cs" />
-                <include name="MainMemory.cs" />
+                <include name="Interpreter.cs" />
-                <include name="MethodMemory.cs" />
+                <include name="ClassRecord.cs" />
-                <include name="Object.cs" />
-                <include name="OpenSimJVM.cs" />
                <include name="Stack.cs" />
-                <include name="StackFrame.cs" />
+                <include name="Object.cs" />
                <include name="Thread.cs" />
+                <include name="MethodMemory.cs" />
                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/ArrayReference.cs" />
                <include name="Types/BaseType.cs" />
+                <include name="Types/ArrayReference.cs" />
                <include name="Types/ObjectReference.cs" />
-                <include name="Types/PrimitiveTypes/Byte.cs" />
                <include name="Types/PrimitiveTypes/Char.cs" />
+                <include name="Types/PrimitiveTypes/Byte.cs" />
                <include name="Types/PrimitiveTypes/Float.cs" />
                <include name="Types/PrimitiveTypes/Int.cs" />
            </sources>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index 30abd84..ab3c34c 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.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
@@ -85,6 +86,28 @@ namespace OpenSim.Storage.LocalStorageBDB
        {
        }
+        public void SaveParcels(ParcelData[] parcel_data)
+        {
+        }
+        public void SaveParcel(ParcelData parcel)
+        {
+        }
+        public void RemoveParcel(ParcelData parcel)
+        {
+        }
+        public void RemoveAllParcels()
+        {
+        }
+        public void LoadParcels(ILocalStorageParcelReceiver recv)
+        {
+            recv.NoParcelDataFromStorage();
+        }
        public void ShutDown()
        {
            sim.GetDb().Close();
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
+++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.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/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index a50795a..93f55d6 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.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
@@ -28,133 +29,120 @@ using System;
 using System.Collections.Generic;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
+using OpenSim.Framework.Console;
 namespace OpenSim.Storage.LocalStorageDb4o
 {
-        /// <summary>
+    /// <summary>
-        /// 
+    /// 
-        /// </summary>
+    /// </summary>
-        public class Db4LocalStorage : ILocalStorage
+    public class Db4LocalStorage : ILocalStorage
-        {
+    {
-                private IObjectContainer db;
+        private IObjectContainer db;
        private string datastore;
-                
-                public Db4LocalStorage()
+        public Db4LocalStorage()
-                {
+        {
-                        
-                }
+        }
        public void Initialise(string dfile)
        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage Opening " + dfile);
+            OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage Opening " + dfile);
            datastore = dfile;
            try
            {
                db = Db4oFactory.OpenFile(datastore);
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage creation");
+                OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage creation");
            }
            catch (Exception e)
            {
                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage :Constructor - Exception occured");
+                OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
            }
        }
-                
-                public void StorePrim(PrimData prim)
+        public void StorePrim(PrimData prim)
-                {
+        {
-                        IObjectSet result = db.Query(new UUIDQuery(prim.FullID));
+            IObjectSet result = db.Query(new UUIDPrimQuery(prim.FullID));
-                        if(result.Count>0)
+            if (result.Count > 0)
-                        {
+            {
-                                //prim already in storage
+                //prim already in storage
-                                //so update it
+                //so update it
-                                PrimData found = (PrimData) result.Next();
+                PrimData found = (PrimData)result.Next();
-                                found.PathBegin = prim.PathBegin;
+                found.PathBegin = prim.PathBegin;
-                                found.PathCurve= prim.PathCurve;
+                found.PathCurve = prim.PathCurve;
-                                found.PathEnd = prim.PathEnd;
+                found.PathEnd = prim.PathEnd;
-                                found.PathRadiusOffset = prim.PathRadiusOffset;
+                found.PathRadiusOffset = prim.PathRadiusOffset;
-                                found.PathRevolutions = prim.PathRevolutions;
+                found.PathRevolutions = prim.PathRevolutions;
-                                found.PathScaleX= prim.PathScaleX;
+                found.PathScaleX = prim.PathScaleX;
-                                found.PathScaleY = prim.PathScaleY;
+                found.PathScaleY = prim.PathScaleY;
-                                found.PathShearX = prim.PathShearX;
+                found.PathShearX = prim.PathShearX;
-                                found.PathShearY = prim.PathShearY;
+                found.PathShearY = prim.PathShearY;
-                                found.PathSkew = prim.PathSkew;
+                found.PathSkew = prim.PathSkew;
-                                found.PathTaperX = prim.PathTaperX;
+                found.PathTaperX = prim.PathTaperX;
-                                found.PathTaperY = prim.PathTaperY;
+                found.PathTaperY = prim.PathTaperY;
-                                found.PathTwist = prim.PathTwist;
+                found.PathTwist = prim.PathTwist;
-                                found.PathTwistBegin = prim.PathTwistBegin;
+                found.PathTwistBegin = prim.PathTwistBegin;
-                                found.PCode = prim.PCode;
+                found.PCode = prim.PCode;
-                                found.ProfileBegin = prim.ProfileBegin;
+                found.ProfileBegin = prim.ProfileBegin;
-                                found.ProfileCurve = prim.ProfileCurve;
+                found.ProfileCurve = prim.ProfileCurve;
-                                found.ProfileEnd = prim.ProfileEnd;
+                found.ProfileEnd = prim.ProfileEnd;
-                                found.ProfileHollow = prim.ProfileHollow;
+                found.ProfileHollow = prim.ProfileHollow;
-                                found.Position = prim.Position;
+                found.Position = prim.Position;
-                                found.Rotation = prim.Rotation;
+                found.Rotation = prim.Rotation;
                found.Texture = prim.Texture;
-                                db.Set(found);
+                db.Set(found);
-                                db.Commit();
+                db.Commit();
-                        }
+            }
-                        else
+            else
-                        {
+            {
-                                //not in storage
+                //not in storage
-                                db.Set(prim);
+                db.Set(prim);
-                                db.Commit();
+                db.Commit();
-                        }
+            }
-                }
+        }
-                
-                public void RemovePrim(LLUUID primID)
+        public void RemovePrim(LLUUID primID)
-                {
+        {
-                        IObjectSet result = db.Query(new UUIDQuery(primID));
+            IObjectSet result = db.Query(new UUIDPrimQuery(primID));
-                        if(result.Count>0)
+            if (result.Count > 0)
-                        {
+            {
-                                PrimData found = (PrimData) result.Next();
+                PrimData found = (PrimData)result.Next();
-                                db.Delete(found);
+                db.Delete(found);
-                        }
+            }
-                }
+        }
-                
-                
-                public void LoadPrimitives(ILocalStorageReceiver receiver)
+        public void LoadPrimitives(ILocalStorageReceiver receiver)
-                {
+        {
-                        IObjectSet result = db.Get(typeof(PrimData));
+            IObjectSet result = db.Get(typeof(PrimData));
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
-                        foreach (PrimData prim in result) {
+            foreach (PrimData prim in result)
-                                receiver.PrimFromStorage(prim);
+            {
-                        }
+                receiver.PrimFromStorage(prim);
-                }
+            }
+        }
        public float[] LoadWorld()
        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Loading world....");
+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Loading world....");
-            //World blank = new World();
            float[] heightmap = null;
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Looking for a heightmap in local DB");
+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
            IObjectSet world_result = db.Get(typeof(MapStorage));
            if (world_result.Count > 0)
            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Found a heightmap in local database, loading");
+                OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
                MapStorage map = (MapStorage)world_result.Next();
                //blank.LandMap = map.Map;
                heightmap = map.Map;
            }
-            else
-            {
-                /*
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - No heightmap found, generating new one");
-                HeightmapGenHills hills = new HeightmapGenHills();
-                // blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
-               // heightmap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
-                heightmap = new float[256, 256];
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Saving heightmap to local database");
-                MapStorage map = new MapStorage();
-                map.Map = heightmap; //blank.LandMap;
-                db.Set(map);
-                db.Commit();
-                 */
-            }
            return heightmap;
        }
@@ -163,7 +151,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
            IObjectSet world_result = db.Get(typeof(MapStorage));
            if (world_result.Count > 0)
            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SaveWorld() - updating saved copy of heightmap in local database");
+                OpenSim.Framework.Console.MainConsole.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
                MapStorage map = (MapStorage)world_result.Next();
                db.Delete(map);
            }
@@ -173,10 +161,111 @@ namespace OpenSim.Storage.LocalStorageDb4o
            db.Commit();
        }
-                public void ShutDown()
+        public void SaveParcel(ParcelData parcel)
-                {
+        {
-                        db.Commit();
+            IObjectSet result = db.Query(new UUIDParcelQuery(parcel.globalID));
-                        db.Close();
+            if (result.Count > 0)
-                }
+            {
-        }
+                //Old Parcel
-}
+                ParcelData updateParcel = (ParcelData)result.Next();
+                updateParcel.AABBMax = parcel.AABBMax;
+                updateParcel.AABBMin = parcel.AABBMin;
+                updateParcel.area = parcel.area;
+                updateParcel.auctionID = parcel.auctionID;
+                updateParcel.authBuyerID = parcel.authBuyerID;
+                updateParcel.category = parcel.category;
+                updateParcel.claimDate = parcel.claimDate;
+                updateParcel.claimPrice = parcel.claimPrice;
+                updateParcel.groupID = parcel.groupID;
+                updateParcel.groupPrims = parcel.groupPrims;
+                updateParcel.isGroupOwned = parcel.isGroupOwned;
+                updateParcel.landingType = parcel.landingType;
+                updateParcel.mediaAutoScale = parcel.mediaAutoScale;
+                updateParcel.mediaID = parcel.mediaID;
+                updateParcel.mediaURL = parcel.mediaURL;
+                updateParcel.musicURL = parcel.musicURL;
+                updateParcel.localID = parcel.localID;
+                updateParcel.ownerID = parcel.ownerID;
+                updateParcel.passHours = parcel.passHours;
+                updateParcel.passPrice = parcel.passPrice;
+                updateParcel.parcelBitmapByteArray = (byte[])parcel.parcelBitmapByteArray.Clone();
+                updateParcel.parcelDesc = parcel.parcelDesc;
+                updateParcel.parcelFlags = parcel.parcelFlags;
+                updateParcel.parcelName = parcel.parcelName;
+                updateParcel.parcelStatus = parcel.parcelStatus;
+                updateParcel.salePrice = parcel.salePrice;
+                updateParcel.snapshotID = parcel.snapshotID;
+                updateParcel.userLocation = parcel.userLocation;
+                updateParcel.userLookAt = parcel.userLookAt;
+                db.Set(updateParcel);
+            }
+            else
+            {
+                db.Set(parcel);
+            }
+            db.Commit();
+        }
+        public void SaveParcels(ParcelData[] parcel_data)
+        {
+            MainConsole.Instance.Notice("Parcel Backup: Saving Parcels...");
+            int i;
+            for (i = 0; i < parcel_data.GetLength(0); i++)
+            {
+                SaveParcel(parcel_data[i]);
+            }
+            MainConsole.Instance.Notice("Parcel Backup: Parcel Save Complete");
+        }
+        public void RemoveParcel(ParcelData parcel)
+        {
+            IObjectSet result = db.Query(new UUIDParcelQuery(parcel.globalID));
+            if (result.Count > 0)
+            {
+                db.Delete(result[0]);
+            }
+            db.Commit();
+        }
+        public void RemoveAllParcels()
+        {
+            MainConsole.Instance.Notice("Parcel Backup: Removing all parcels...");
+            IObjectSet result = db.Get(typeof(ParcelData));
+            if (result.Count > 0)
+            {
+                foreach (ParcelData parcelData in result)
+                {
+                    RemoveParcel(parcelData);
+                }
+            }
+        }
+        public void LoadParcels(ILocalStorageParcelReceiver recv)
+        {
+            MainConsole.Instance.Notice("Parcel Backup: Loading Parcels...");
+            IObjectSet result = db.Get(typeof(ParcelData));
+            if (result.Count > 0)
+            {
+                MainConsole.Instance.Notice("Parcel Backup: Parcels exist in database.");
+                foreach (ParcelData parcelData in result)
+                {
+                    recv.ParcelFromStorage(parcelData);
+                }
+            }
+            else
+            {
+                MainConsole.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel.");
+                recv.NoParcelDataFromStorage();
+            }
+            MainConsole.Instance.Notice("Parcel Backup: Parcels Restored");
+        }
+        public void ShutDown()
+        {
+            db.Commit();
+            db.Close();
+        }
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 9b4ff5d..7d90947 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -93,13 +93,16 @@
    <Compile Include="AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Db4LocalStorage.cs">
+    <Compile Include="MapStorage.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="MapStorage.cs">
+    <Compile Include="UUIDPrimQuery.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UUIDQuery.cs">
+    <Compile Include="UUIDParcelQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Db4LocalStorage.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.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/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index da2db14..9789712 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,9 +12,10 @@
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
                <include name="MapStorage.cs" />
-                <include name="UUIDQuery.cs" />
+                <include name="UUIDPrimQuery.cs" />
+                <include name="UUIDParcelQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs
new file mode 100644
index 0000000..d24fb5f
--- /dev/null
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -0,0 +1,52 @@
+/*
+* 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:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * 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 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 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 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
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+    public class UUIDParcelQuery : Predicate
+    {
+        private LLUUID globalIDSearch;
+        public UUIDParcelQuery(LLUUID find)
+        {
+            globalIDSearch = find;
+        }
+        public bool Match(ParcelData parcel)
+        {
+            return (parcel.globalID == globalIDSearch);
+        }
+    }
+}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs
new file mode 100644
index 0000000..b2e8a91
--- /dev/null
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -0,0 +1,52 @@
+/*
+* 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:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * 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 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 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 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
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+    public class UUIDPrimQuery : Predicate
+    {
+        private LLUUID _findID;
+        public UUIDPrimQuery(LLUUID find)
+        {
+            _findID = find;
+        }
+        public bool Match(PrimData prim)
+        {
+            return (prim.FullID == _findID);
+        }
+    }
+}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
deleted file mode 100644
index ba9e139..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-    public class UUIDQuery : Predicate
-    {
-        private LLUUID _findID;
-        public UUIDQuery(LLUUID find)
-        {
-            _findID = find;
-        }
-        public bool Match(PrimData prim)
-        {
-            return (prim.FullID == _findID);
-        }
-    }
-}
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.Warn("SQLiteLocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
+                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.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
+                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.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
+                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();
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.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.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 478f224..04879a6 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -43,7 +43,7 @@ namespace OpenSim.world
        public void SendInitialPosition()
        {
            Console.WriteLine("sending initial Avatar data");
-            this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
+            this.ControllingClient.SendAvatarData(this.m_world.m_regInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
        }
        /// <summary>
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index ecd938b..368bc53 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -33,11 +33,7 @@ namespace OpenSim.world
        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
        private ulong m_regionHandle;
        private Dictionary<uint, IClientAPI> m_clientThreads;
-        private string m_regionName;
-        private ushort m_regionWaterHeight;
-        private bool m_regionTerraform;
        private bool childAvatar = false;
-        private RegionInfo regionData;
        /// <summary>
        /// 
@@ -46,17 +42,13 @@ namespace OpenSim.world
        /// <param name="world"></param>
        /// <param name="clientThreads"></param>
        /// <param name="regionDat"></param>
-        public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat)
+        public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads)
        {
            m_world = world;
            m_clientThreads = clientThreads;
-            regionData = regionDat;
            this.uuid = theClient.AgentId;
-            m_regionName = regionData.RegionName;
+            
-            m_regionHandle = regionData.RegionHandle;
-            m_regionTerraform = regionData.RegionTerraform;
-            m_regionWaterHeight = regionData.RegionWaterHeight;
            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
            ControllingClient = theClient;
            this.firstname = ControllingClient.FirstName;
@@ -148,7 +140,7 @@ namespace OpenSim.world
        /// </summary>
        public void CompleteMovement()
        {
-            this.ControllingClient.MoveAgentIntoRegion(this.regionData);
+            this.ControllingClient.MoveAgentIntoRegion(this.m_world.m_regInfo);
        }
        /// <summary>
@@ -174,7 +166,7 @@ namespace OpenSim.world
        /// </summary>
        public void SendRegionHandshake()
        {
-            this.ControllingClient.SendRegionHandshake(this.regionData);
+            this.m_world.estateManager.sendRegionHandshake(this.ControllingClient);
        }
        /// <summary>
diff --git a/OpenSim/OpenSim.World/Estate/EstateManager.cs b/OpenSim/OpenSim.World/Estate/EstateManager.cs
new file mode 100644
index 0000000..37abc6d
--- /dev/null
+++ b/OpenSim/OpenSim.World/Estate/EstateManager.cs
@@ -0,0 +1,296 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.world;
+using OpenSim;
+using libsecondlife;
+using libsecondlife.Packets;
+namespace OpenSim.world.Estate
+{
+    /// <summary>
+    /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
+    /// </summary>
+    public class EstateManager
+    {
+        private World m_world;
+        public EstateManager(World world)
+        {
+            m_world = world; //Estate settings found at world.m_regInfo.estateSettings            
+        }
+        private bool convertParamStringToBool(byte[] field)
+        {
+            string s = Helpers.FieldToUTF8String(field);
+            if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
+            {
+                return true;
+            }
+            return false;
+        }
+        public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == m_world.m_regInfo.MasterAvatarAssignedUUID)
+            {
+                switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
+                {
+                    case "getinfo":
+                        Console.WriteLine("GETINFO Requested");
+                        this.sendRegionInfoPacketToAll();
+                        break;
+                    case "setregioninfo":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_world.m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
+                            if (convertParamStringToBool(packet.ParamList[0].Parameter))
+                            {
+                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
+                            }
+                            if (convertParamStringToBool(packet.ParamList[1].Parameter))
+                            {
+                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
+                            }
+                            if (convertParamStringToBool(packet.ParamList[2].Parameter))
+                            {
+                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
+                            }
+                            if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
+                            {
+                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
+                            }
+                            int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
+                            m_world.m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
+                            float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+                            m_world.m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
+                            int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
+                            m_world.m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
+                            
+                            if (convertParamStringToBool(packet.ParamList[7].Parameter))
+                            {
+                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
+                            }
+                            if (convertParamStringToBool(packet.ParamList[8].Parameter))
+                            {
+                                m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
+                            }
+                            sendRegionInfoPacketToAll();
+                            
+                        }
+                        break;
+                    case "texturebase":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_world.m_regInfo.estateSettings.terrainBase0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_world.m_regInfo.estateSettings.terrainBase1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_world.m_regInfo.estateSettings.terrainBase2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_world.m_regInfo.estateSettings.terrainBase3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturedetail":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_world.m_regInfo.estateSettings.terrainDetail0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_world.m_regInfo.estateSettings.terrainDetail1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_world.m_regInfo.estateSettings.terrainDetail2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_world.m_regInfo.estateSettings.terrainDetail3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "textureheights":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 3)
+                            {
+                                float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
+                                float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_world.m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
+                                        m_world.m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
+                                        break;
+                                    case 1:
+                                        m_world.m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
+                                        m_world.m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
+                                        break;
+                                    case 2:
+                                        m_world.m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
+                                        m_world.m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
+                                        break;
+                                    case 3:
+                                        m_world.m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
+                                        m_world.m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturecommit":
+                        sendRegionHandshakeToAll();
+                        break;
+                    case "setregionterrain":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_world.m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
+                            m_world.m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
+                            m_world.m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
+                            m_world.m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
+                            m_world.m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+                            sendRegionInfoPacketToAll();
+                        }
+                        break;
+                    default:
+                        OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
+                        break;
+                }
+            }
+        }
+        public void sendRegionInfoPacketToAll()
+        {
+            foreach (OpenSim.world.Avatar av in m_world.Avatars.Values)
+            {
+                this.sendRegionInfoPacket(av.ControllingClient);
+            }
+        }
+        public void sendRegionHandshakeToAll()
+        {
+            foreach (OpenSim.world.Avatar av in m_world.Avatars.Values)
+            {
+                this.sendRegionHandshake(av.ControllingClient);
+            }
+        }
+        public void sendRegionInfoPacket(IClientAPI remote_client)
+        {
+            AgentCircuitData circuitData = remote_client.RequestClientInfo();
+            RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
+            regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
+            regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
+            regionInfoPacket.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor;
+            regionInfoPacket.RegionInfo.EstateID = m_world.m_regInfo.estateSettings.estateID;
+            regionInfoPacket.RegionInfo.MaxAgents = m_world.m_regInfo.estateSettings.maxAgents;
+            regionInfoPacket.RegionInfo.ObjectBonusFactor = m_world.m_regInfo.estateSettings.objectBonusFactor;
+            regionInfoPacket.RegionInfo.ParentEstateID = m_world.m_regInfo.estateSettings.parentEstateID;
+            regionInfoPacket.RegionInfo.PricePerMeter = m_world.m_regInfo.estateSettings.pricePerMeter;
+            regionInfoPacket.RegionInfo.RedirectGridX = m_world.m_regInfo.estateSettings.redirectGridX;
+            regionInfoPacket.RegionInfo.RedirectGridY = m_world.m_regInfo.estateSettings.redirectGridY;
+            regionInfoPacket.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags;
+            regionInfoPacket.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess;
+            regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_world.m_regInfo.RegionName);
+            regionInfoPacket.RegionInfo.SunHour = m_world.m_regInfo.estateSettings.sunHour;
+            regionInfoPacket.RegionInfo.TerrainLowerLimit = m_world.m_regInfo.estateSettings.terrainLowerLimit;
+            regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_world.m_regInfo.estateSettings.terrainRaiseLimit;
+            regionInfoPacket.RegionInfo.UseEstateSun = !m_world.m_regInfo.estateSettings.useFixedSun;
+            regionInfoPacket.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight;
+            remote_client.OutPacket(regionInfoPacket);
+        }
+        public void sendRegionHandshake(IClientAPI remote_client)
+        {
+            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+            RegionHandshakePacket handshake = new RegionHandshakePacket();
+            handshake.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor;
+            handshake.RegionInfo.IsEstateManager = false;
+            handshake.RegionInfo.TerrainHeightRange00 = m_world.m_regInfo.estateSettings.terrainHeightRange0;
+            handshake.RegionInfo.TerrainHeightRange01 = m_world.m_regInfo.estateSettings.terrainHeightRange1;
+            handshake.RegionInfo.TerrainHeightRange10 = m_world.m_regInfo.estateSettings.terrainHeightRange2;
+            handshake.RegionInfo.TerrainHeightRange11 = m_world.m_regInfo.estateSettings.terrainHeightRange3;
+            handshake.RegionInfo.TerrainStartHeight00 = m_world.m_regInfo.estateSettings.terrainStartHeight0;
+            handshake.RegionInfo.TerrainStartHeight01 = m_world.m_regInfo.estateSettings.terrainStartHeight1;
+            handshake.RegionInfo.TerrainStartHeight10 = m_world.m_regInfo.estateSettings.terrainStartHeight2;
+            handshake.RegionInfo.TerrainStartHeight11 = m_world.m_regInfo.estateSettings.terrainStartHeight3;
+            handshake.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess;
+            handshake.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight;
+            handshake.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags;
+            handshake.RegionInfo.SimName = _enc.GetBytes(m_world.m_regInfo.estateSettings.waterHeight + "\0");
+            handshake.RegionInfo.SimOwner = m_world.m_regInfo.MasterAvatarAssignedUUID;
+            handshake.RegionInfo.TerrainBase0 = m_world.m_regInfo.estateSettings.terrainBase0;
+            handshake.RegionInfo.TerrainBase1 = m_world.m_regInfo.estateSettings.terrainBase1;
+            handshake.RegionInfo.TerrainBase2 = m_world.m_regInfo.estateSettings.terrainBase2;
+            handshake.RegionInfo.TerrainBase3 = m_world.m_regInfo.estateSettings.terrainBase3;
+            handshake.RegionInfo.TerrainDetail0 = m_world.m_regInfo.estateSettings.terrainDetail0;
+            handshake.RegionInfo.TerrainDetail1 = m_world.m_regInfo.estateSettings.terrainDetail1;
+            handshake.RegionInfo.TerrainDetail2 = m_world.m_regInfo.estateSettings.terrainDetail2;
+            handshake.RegionInfo.TerrainDetail3 = m_world.m_regInfo.estateSettings.terrainDetail3;
+            handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
+            remote_client.OutPacket(handshake);
+        }
+    }
+}
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index dd469a9..f3c7b1f 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -133,49 +133,52 @@
    <Compile Include="Avatar.Client.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Avatar.cs">
+    <Compile Include="Entity.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Avatar.Update.cs">
+    <Compile Include="World.PacketHandlers.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="AvatarAnimations.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Entity.cs">
+    <Compile Include="SceneObject.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Primitive.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="SceneObject.cs">
+    <Compile Include="World.Scripting.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="World.cs">
+    <Compile Include="WorldBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="World.PacketHandlers.cs">
+    <Compile Include="ParcelManager.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="World.Scripting.cs">
+    <Compile Include="Avatar.Update.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="WorldBase.cs">
+    <Compile Include="World.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="scripting\IScriptContext.cs">
+    <Compile Include="Avatar.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="scripting\IScriptEntity.cs">
+    <Compile Include="scripting\IScriptHandler.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="scripting\IScriptHandler.cs">
+    <Compile Include="scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\IScriptContext.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="scripting\Script.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="scripting\ScriptFactory.cs">
+    <Compile Include="scripting\IScriptEntity.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="scripting\Scripts\FollowRandomAvatar.cs">
@@ -187,6 +190,9 @@
    <Compile Include="types\Triangle.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Estate\EstateManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj.user b/OpenSim/OpenSim.World/OpenSim.World.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj.user
+++ b/OpenSim/OpenSim.World/OpenSim.World.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.World/ParcelManager.cs b/OpenSim/OpenSim.World/ParcelManager.cs
new file mode 100644
index 0000000..d571150
--- /dev/null
+++ b/OpenSim/OpenSim.World/ParcelManager.cs
@@ -0,0 +1,832 @@
+/*
+* 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:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * 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 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 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 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
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+namespace OpenSim.world
+{
+    
+    #region ParcelManager Class
+    /// <summary>
+    /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
+    /// </summary>
+    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
+    {
+        #region Constants
+        //Parcel types set with flags in ParcelOverlay.
+        //Only one of these can be used. 
+        public const byte PARCEL_TYPE_PUBLIC = (byte)0;      //Equals 00000000
+        public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
+        public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
+        public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
+        public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
+        public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
+        //Flags that when set, a border on the given side will be placed
+        //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
+        //This took forever to figure out -- jeesh. /blame LL for even having to send these
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
+        //RequestResults (I think these are right, they seem to work):
+        public const int PARCEL_RESULT_ONE_PARCEL       = 0;    // The request they made contained only one parcel
+        public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1;    // The request they made contained more than one parcel
+        //These are other constants. Yay!
+        public const int START_PARCEL_LOCAL_ID = 1;
+        #endregion
+        #region Member Variables
+        public Dictionary<int, Parcel> parcelList = new Dictionary<int, Parcel>();
+        private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+        private int[,] parcelIDList = new int[64, 64];
+        private static World m_world;
+        #endregion
+        #region Constructors
+        public ParcelManager(World world)
+        {
+            m_world = world;
+            parcelIDList.Initialize();
+        }
+        #endregion
+        #region Member Functions
+        #region Parcel From Storage Functions
+        public void ParcelFromStorage(ParcelData data)
+        {
+            Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
+            new_parcel.parcelData = data.Copy();
+            new_parcel.setParcelBitmapFromByteArray();
+            addParcel(new_parcel);
+        }
+        public void NoParcelDataFromStorage()
+        {
+            resetSimParcels();
+        }
+        #endregion
+        #region Parcel Add/Remove/Get/Create
+        /// <summary>
+        /// Creates a basic Parcel object without an owner (a zeroed key)
+        /// </summary>
+        /// <returns></returns>
+        public Parcel createBaseParcel()
+        {
+            return new Parcel(new LLUUID(), false, m_world);
+        }
+        /// <summary>
+        /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
+        /// </summary>
+        /// <param name="new_parcel">The parcel being added</param>
+        public void addParcel(Parcel new_parcel)
+        {
+            lastParcelLocalID++;
+            new_parcel.parcelData.localID = lastParcelLocalID;
+            parcelList.Add(lastParcelLocalID, new_parcel.Copy());
+            bool[,] parcelBitmap = new_parcel.getParcelBitmap();
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y])
+                    {
+                        parcelIDList[x, y] = lastParcelLocalID;
+                    }
+                }
+            }
+            parcelList[lastParcelLocalID].forceUpdateParcelInfo();
+            
+        }
+        /// <summary>
+        /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
+        /// </summary>
+        /// <param name="local_id">Parcel.localID of the parcel to remove.</param>
+        public void removeParcel(int local_id)
+        {
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelIDList[x, y] == local_id)
+                    {
+                        throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
+                    }
+                }
+            }
+            m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
+            parcelList.Remove(local_id);
+        }
+        public void performFinalParcelJoin(Parcel master, Parcel slave)
+        {
+            int x, y;
+            bool[,] parcelBitmapSlave = slave.getParcelBitmap();
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmapSlave[x, y])
+                    {
+                        parcelIDList[x, y] = master.parcelData.localID;
+                    }
+                }
+            }
+            removeParcel(slave.parcelData.localID);
+        }
+        /// <summary>
+        /// Get the parcel at the specified point
+        /// </summary>
+        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
+        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
+        /// <returns>Parcel at the point supplied</returns>
+        public Parcel getParcel(int x, int y)
+        {
+            if (x > 256 || y > 256 || x < 0 || y < 0)
+            {
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+            else
+            {
+                return parcelList[parcelIDList[x / 4, y / 4]];
+            }
+        }
+        #endregion
+        #region Parcel Modification
+        /// <summary>
+        /// Subdivides a parcel
+        /// </summary>
+        /// <param name="start_x">West Point</param>
+        /// <param name="start_y">South Point</param>
+        /// <param name="end_x">East Point</param>
+        /// <param name="end_y">North Point</param>
+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
+        /// <returns>Returns true if successful</returns>
+        public bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            //First, lets loop through the points and make sure they are all in the same parcel
+            //Get the parcel at start
+            Parcel startParcel = getParcel(start_x, start_y);
+            if (startParcel == null) return false; //No such parcel at the beginning
+            //Loop through the points
+            try
+            {
+                int totalX = end_x - start_x;
+                int totalY = end_y - start_y;
+                int x, y;
+                for (y = 0; y < totalY; y++)
+                {
+                    for (x = 0; x < totalX; x++)
+                    {
+                        Parcel tempParcel = getParcel(start_x + x, start_y + y);
+                        if (tempParcel == null) return false; //No such parcel at that point
+                        if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                return false; //Exception. For now, lets skip subdivision
+            }
+            //If we are still here, then they are subdividing within one parcel
+            //Check owner
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                return false; //They cant do this!
+            }
+            //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
+            Parcel newParcel = startParcel.Copy();
+            newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
+            newParcel.parcelData.globalID = LLUUID.Random();
+            newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
+            //Now, lets set the subdivision area of the original to false
+            int startParcelIndex = startParcel.parcelData.localID;
+            parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
+            parcelList[startParcelIndex].forceUpdateParcelInfo();
+            
+            //Now add the new parcel
+            addParcel(newParcel);
+             
+            return true;
+        }
+        /// <summary>
+        /// Join 2 parcels together
+        /// </summary>
+        /// <param name="start_x">x value in first parcel</param>
+        /// <param name="start_y">y value in first parcel</param>
+        /// <param name="end_x">x value in second parcel</param>
+        /// <param name="end_y">y value in second parcel</param>
+        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the parcels</param>
+        /// <returns>Returns true if successful</returns>
+        public bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            end_x -= 4;
+            end_y -= 4;
+            
+            //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
+            //This should be fixed later -- somewhat "incomplete code" --Ming
+            Parcel startParcel, endParcel;
+            try
+            {
+                startParcel = getParcel(start_x, start_y);
+                endParcel = getParcel(end_x, end_y);
+            }
+            catch (Exception e)
+            {
+                return false; //Error occured when trying to get the start and end parcels
+            }
+            if (startParcel == endParcel)
+            {
+                return false; //Subdivision of the same parcel is not allowed
+            }
+            //Check the parcel owners:
+            if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
+            {
+                return false;
+            }
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                //TODO: Group editing stuff. Avatar owner support for now
+                return false;
+            }
+            //Same owners! Lets join them
+            //Merge them to startParcel
+            parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
+            performFinalParcelJoin(startParcel, endParcel);
+            return true;
+        }
+        #endregion
+        #region Parcel Updating
+        /// <summary>
+        /// Where we send the ParcelOverlay packet to the client
+        /// </summary>
+        /// <param name="remote_client">The object representing the client</param>
+        public void sendParcelOverlay(IClientAPI remote_client)
+        {
+            const int PARCEL_BLOCKS_PER_PACKET = 1024;
+            int x, y = 0;
+            byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+            int byteArrayCount = 0;
+            int sequenceID = 0;
+            ParcelOverlayPacket packet;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
+                    Parcel currentParcelBlock = getParcel(x * 4, y * 4);
+                    if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
+                    {
+                        //Owner Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
+                    }
+                    else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
+                    {
+                        //Sale Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
+                    }
+                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
+                    {
+                        //Public Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
+                    }
+                    else
+                    {
+                        //Other Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
+                    }
+                    //Now for border control
+                    if (x == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+                    else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+                    if (y == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+                    else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+                    byteArray[byteArrayCount] = tempByte;
+                    byteArrayCount++;
+                    if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
+                    {
+                        byteArrayCount = 0;
+                        packet = new ParcelOverlayPacket();
+                        packet.ParcelData.Data = byteArray;
+                        packet.ParcelData.SequenceID = sequenceID;
+                        remote_client.OutPacket((Packet)packet);
+                        sequenceID++;
+                        byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+                    }
+                }
+            }
+            packet = new ParcelOverlayPacket();
+            packet.ParcelData.Data = byteArray;
+            packet.ParcelData.SequenceID = sequenceID; //Eh?
+            remote_client.OutPacket((Packet)packet);
+        }
+        #endregion
+        /// <summary>
+        /// Resets the sim to the default parcel (full sim parcel owned by the default user)
+        /// </summary>
+        public void resetSimParcels()
+        {
+            //Remove all the parcels in the sim and add a blank, full sim parcel set to public
+            parcelList.Clear();
+            lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+            parcelIDList.Initialize();
+            Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
+            fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
+            fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
+            fullSimParcel.parcelData.parcelDesc = "";
+            fullSimParcel.parcelData.ownerID = m_world.m_regInfo.MasterAvatarAssignedUUID;
+            fullSimParcel.parcelData.salePrice = 1;
+            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
+            fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
+            addParcel(fullSimParcel);
+        }
+        #endregion
+    }
+    #endregion
+    #region Parcel Class
+    /// <summary>
+    /// Keeps track of a specific parcel's information
+    /// </summary>
+    public class Parcel
+    {
+        #region Member Variables
+        public ParcelData parcelData = new ParcelData();
+        public World m_world;
+        private bool[,] parcelBitmap = new bool[64, 64];
+        #endregion
+        #region Constructors
+        public Parcel(LLUUID owner_id, bool is_group_owned, World world)
+        {
+            m_world = world;
+            parcelData.ownerID = owner_id;
+            parcelData.isGroupOwned = is_group_owned;
+        }
+        #endregion
+        #region Member Functions
+        #region General Functions
+        /// <summary>
+        /// Checks to see if this parcel contains a point
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Returns true if the parcel contains the specified point</returns>
+        public bool containsPoint(int x, int y)
+        {
+            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+            {
+                return (parcelBitmap[x / 4, y / 4] == true);
+            }
+            else
+            {
+                return false;
+            }
+        }
+        public Parcel Copy()
+        {
+            Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
+            //Place all new variables here!
+            newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
+            newParcel.parcelData = parcelData.Copy();
+           
+            return newParcel;
+        }
+        #endregion
+        #region Packet Request Handling
+        /// <summary>
+        /// Sends parcel properties as requested
+        /// </summary>
+        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
+        /// <param name="snap_selection">Bool sent by client for them to use</param>
+        /// <param name="remote_client">Object representing the client</param>
+        public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+        {
+            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
+            updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
+            updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
+            updatePacket.ParcelData.Area = parcelData.area;
+            updatePacket.ParcelData.AuctionID = parcelData.auctionID;
+            updatePacket.ParcelData.AuthBuyerID =parcelData.authBuyerID; //unemplemented
+            updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
+            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
+            updatePacket.ParcelData.Category = (byte)parcelData.category;
+            updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
+            updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
+            updatePacket.ParcelData.GroupID = parcelData.groupID;
+            updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
+            updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
+            updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
+            updatePacket.ParcelData.LocalID = parcelData.localID;
+            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
+            updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
+            updatePacket.ParcelData.MediaID = parcelData.mediaID;
+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
+            updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+            updatePacket.ParcelData.OtherCount = 0; //unemplemented
+            updatePacket.ParcelData.OtherPrims = 0; //unemplented
+            updatePacket.ParcelData.OwnerID = parcelData.ownerID;
+            updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
+            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
+            updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
+            updatePacket.ParcelData.PassHours = parcelData.passHours;
+            updatePacket.ParcelData.PassPrice = parcelData.passPrice;
+            updatePacket.ParcelData.PublicCount = 0; //unemplemented
+            updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
+            updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
+            updatePacket.ParcelData.RentPrice = 0; //??
+            updatePacket.ParcelData.RequestResult = request_result;
+            updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
+            updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
+            updatePacket.ParcelData.SelfCount = 0;//unemplemented
+            updatePacket.ParcelData.SequenceID = sequence_id;
+            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
+            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.SnapSelection = snap_selection; 
+            updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
+            updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
+            updatePacket.ParcelData.TotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.UserLocation = parcelData.userLocation;
+            updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
+            remote_client.OutPacket((Packet)updatePacket);
+        }
+        public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == parcelData.ownerID)
+            {
+                //Needs later group support
+                parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
+                parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
+                parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+                parcelData.groupID = packet.ParcelData.GroupID;
+                parcelData.landingType = packet.ParcelData.LandingType;
+                parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+                parcelData.mediaID = packet.ParcelData.MediaID;
+                parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+                parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
+                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
+                parcelData.passHours = packet.ParcelData.PassHours;
+                parcelData.passPrice = packet.ParcelData.PassPrice;
+                parcelData.salePrice = packet.ParcelData.SalePrice;
+                parcelData.snapshotID = packet.ParcelData.SnapshotID;
+                parcelData.userLocation = packet.ParcelData.UserLocation;
+                parcelData.userLookAt = packet.ParcelData.UserLookAt;
+                foreach (Avatar av in m_world.Avatars.Values)
+                {
+                    Parcel over = m_world.parcelManager.getParcel((int)Math.Round(av.Pos.X), (int)Math.Round(av.Pos.Y));
+                    if (over == this)
+                    {
+                        sendParcelProperties(0, false, 0, av.ControllingClient);
+                    }
+                }
+            }
+        }
+        #endregion
+        #region Update Functions
+        /// <summary>
+        /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
+        /// </summary>
+        private void updateAABBAndAreaValues()
+        {
+            int min_x = 64;
+            int min_y = 64;
+            int max_x = 0;
+            int max_y = 0;
+            int tempArea = 0;
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y] == true)
+                    {
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+                        tempArea += 16; //16sqm parcel
+                    }
+                }
+            }
+            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
+            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
+            parcelData.area = tempArea;
+        }
+        public void updateParcelBitmapByteArray()
+        {
+            parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
+        }
+        /// <summary>
+        /// Update all settings in parcel such as area, bitmap byte array, etc
+        /// </summary>
+        public void forceUpdateParcelInfo()
+        {
+            this.updateAABBAndAreaValues();
+            this.updateParcelBitmapByteArray();
+        }
+        public void setParcelBitmapFromByteArray()
+        {
+            parcelBitmap = convertBytesToParcelBitmap();
+        }
+        #endregion
+        #region Parcel Bitmap Functions
+        /// <summary>
+        /// Sets the parcel's bitmap manually
+        /// </summary>
+        /// <param name="bitmap">64x64 block representing where this parcel is on a map</param>
+        public void setParcelBitmap(bool[,] bitmap)
+        {
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap");
+            }
+            else
+            {
+                //Valid: Lets set it
+                parcelBitmap = bitmap;
+                forceUpdateParcelInfo();
+               
+            }
+        }
+        /// <summary>
+        /// Gets the parcels bitmap manually
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] getParcelBitmap()
+        {
+            return parcelBitmap;
+        }
+        /// <summary>
+        /// Converts the parcel bitmap to a packet friendly byte array
+        /// </summary>
+        /// <returns></returns>
+        private byte[] convertParcelBitmapToBytes()
+        {
+            byte[] tempConvertArr = new byte[512];
+            byte tempByte = 0;
+            int x, y, i, byteNum = 0;
+            i = 0;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
+                    if (i % 8 == 0)
+                    {
+                        tempConvertArr[byteNum] = tempByte;
+                        tempByte = (byte)0;
+                        i = 0;
+                        byteNum++;
+                    }
+                }
+            }
+            return tempConvertArr;
+        }
+        private bool[,] convertBytesToParcelBitmap()
+        {
+            bool[,] tempConvertMap = new bool[64, 64];
+            tempConvertMap.Initialize(); 
+            byte tempByte = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
+            for(i = 0; i < 512; i++)
+            {
+                tempByte = parcelData.parcelBitmapByteArray[i];
+                for(bitNum = 0; bitNum < 8; bitNum++)
+                {
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
+                    tempConvertMap[x, y] = bit;
+                    x++;
+                    if(x > 63)
+                    {
+                        x = 0; 
+                        y++;
+                    }
+             
+                }
+            }
+            return tempConvertMap;
+        }
+        /// <summary>
+        /// Full sim parcel creation
+        /// </summary>
+        /// <returns></returns>
+        public static bool[,] basicFullRegionParcelBitmap()
+        {
+            return getSquareParcelBitmap(0, 0, 256, 256);
+        }
+        /// <summary>
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// </summary>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <returns></returns>
+        public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
+        {
+            bool[,] tempBitmap = new bool[64, 64];
+            tempBitmap.Initialize();
+            tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            return tempBitmap;
+        }
+        /// <summary>
+        /// Change a parcel's bitmap at within a square and set those points to a specific value
+        /// </summary>
+        /// <param name="parcel_bitmap"></param>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
+        /// <returns></returns>
+        public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
+        {
+            if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
+            }
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (x >= start_x / 4 && x < end_x / 4
+                        && y >= start_y / 4 && y < end_y / 4)
+                    {
+                        parcel_bitmap[x, y] = set_value;
+                    }
+                }
+            }
+            return parcel_bitmap;
+        }
+        /// <summary>
+        /// Join the true values of 2 bitmaps together
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns></returns>
+        public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        {
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
+            }
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
+                
+            }
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (bitmap_add[x, y])
+                    {
+                        bitmap_base[x, y] = true;
+                    }
+                }
+            }
+            return bitmap_base;
+        }
+        #endregion
+        #endregion
+       
+    }
+    #endregion
+    
+    
+}
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 1d56ea3..1f97820 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -15,6 +15,8 @@ using OpenSim.Framework;
 using OpenSim.RegionServer.world.scripting;
 using OpenSim.Terrain;
 using OpenGrid.Framework.Communications;
+using OpenSim.world.Estate;
 namespace OpenSim.world
 {
@@ -40,6 +42,9 @@ namespace OpenSim.world
        protected RegionCommsHostBase regionCommsHost;
        protected RegionServerCommsManager commsManager;
+        public ParcelManager parcelManager;
+        public EstateManager estateManager;
        #region Properties
        /// <summary>
        /// 
@@ -444,7 +449,7 @@ namespace OpenSim.world
        /// <summary>
        /// 
        /// </summary>
-        /// <param name="remoteClient"></param>
+        /// <param name="remoteClient"></param          
        /// <param name="agentID"></param>
        /// <param name="child"></param>
        public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
@@ -458,7 +463,7 @@ namespace OpenSim.world
            try
            {
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
-                newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
+                newAvatar = new Avatar(remoteClient, this, m_clientThreads);
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
                newAvatar.SendRegionHandshake();
diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs
index 19a8fb5..4d806e3 100644
--- a/OpenSim/OpenSim.World/WorldBase.cs
+++ b/OpenSim/OpenSim.World/WorldBase.cs
@@ -23,7 +23,7 @@ namespace OpenSim.world
        protected string m_regionName;
       // protected InventoryCache _inventoryCache;
       // protected AssetCache _assetCache;
-        protected RegionInfo m_regInfo;
+        public RegionInfo m_regInfo;
        public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
        protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
diff --git a/OpenSim/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user
index ba0418b..66e2cb4 100644
--- a/OpenSim/OpenSim/OpenSim.csproj.user
+++ b/OpenSim/OpenSim/OpenSim.csproj.user
@@ -3,7 +3,7 @@
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <StartArguments>-loginserver -sandbox -accounts</StartArguments>
-    <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/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
index 4f8ca8a..9c209ac 100644
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim/OpenSim.exe.build
@@ -29,8 +29,10 @@
                <include name="../../bin/OpenSim.Framework.Console.dll" />
                <include name="../../bin/OpenSim.Physics.Manager.dll" />
                <include name="../../bin/OpenSim.Servers.dll" />
+                <include name="../../bin/OpenSim.World.dll" />
                <include name="../../bin/OpenSim.RegionServer.dll" />
                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="../../bin/OpenGrid.Framework.Communications.dll" />
                <include name="../../bin/XMLRPC.dll" />
            </references>
        </csc>
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 7c83dee..cbcf3db 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -69,7 +69,6 @@ namespace OpenSim
            m_loginserver = startLoginServer;
            m_physicsEngine = physicsEngine;
            m_config = configFile;
            m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
            OpenSim.Framework.Console.MainConsole.Instance = m_console;
        }
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 55efffa..df6b4f4 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
    <Compile Include="Prebuild.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Core\Kernel.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -95,19 +92,25 @@
    <Compile Include="Core\WarningException.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\ITarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\IDataNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
+    <Compile Include="Core\Nodes\ProjectNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -119,76 +122,73 @@
    <Compile Include="Core\Nodes\ExcludeNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
+    <Compile Include="Core\Nodes\OptionsNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Nodes\MatchNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Nodes\ProcessNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Core\Nodes\ReferenceNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Targets\DebugTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Targets\AutotoolsTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+    <Compile Include="Core\Targets\VS2002Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
+    <Compile Include="Core\Targets\VS2003Target.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+    <Compile Include="Core\Targets\VS2005Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
+    <Compile Include="Core\Parse\Preprocessor.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Utilities\Helper.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Utilities\Log.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\Log.cs">
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user
index 9bfaf67..082d673 100644
--- a/Prebuild/src/Prebuild.csproj.user
+++ b/Prebuild/src/Prebuild.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/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 43f5516..f2c8cab 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
            </resources>
            <sources failonempty="true">
                <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
                <include name="Core/Kernel.cs" />
                <include name="Core/UnknownLanguageException.cs" />
                <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/FatalException.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
                <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
                <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
                <include name="Core/Nodes/ConfigurationNode.cs" />
                <include name="Core/Nodes/DataNode.cs" />
                <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
                <include name="Core/Nodes/SolutionNode.cs" />
-                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
                <include name="Core/Targets/DebugTarget.cs" />
                <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
                <include name="Core/Targets/SharpDevelopTarget.cs" />
                <include name="Core/Targets/VS2002Target.cs" />
                <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
                <include name="Core/Utilities/Helper.cs" />
                <include name="Core/Utilities/Log.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
author	mingchen	2007-06-08 19:10:55 +0000
committer	mingchen	2007-06-08 19:10:55 +0000
commit	2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch)
tree	bd07f5ddd43dc11077dc445d7b50a983ed37535f
parent	*Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff)
download	opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.zip opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.gz opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.bz2 opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.xz