From 2239ecba188b0435d9a6d58b1c66f2b6eb591116 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 8 Jun 2007 19:10:55 +0000
Subject: *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

---
 Prebuild/src/Prebuild.csproj      | 56 +++++++++++++++++++--------------------
 Prebuild/src/Prebuild.csproj.user |  2 +-
 Prebuild/src/Prebuild.exe.build   | 34 ++++++++++++------------
 3 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'Prebuild')

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/Interfaces/ITarget.cs" />
+                <include name="Core/Nodes/ProjectNode.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/Parse/Preprocessor.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.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/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/AutotoolsTarget.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/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Targets/NAntTarget.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()}">
-- 
cgit v1.1