diff options
author | mingchen | 2007-06-08 19:10:55 +0000 |
---|---|---|
committer | mingchen | 2007-06-08 19:10:55 +0000 |
commit | 2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch) | |
tree | bd07f5ddd43dc11077dc445d7b50a983ed37535f /Prebuild/src | |
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 |
*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
Diffstat (limited to 'Prebuild/src')
-rw-r--r-- | Prebuild/src/Prebuild.csproj | 56 | ||||
-rw-r--r-- | Prebuild/src/Prebuild.csproj.user | 2 | ||||
-rw-r--r-- | Prebuild/src/Prebuild.exe.build | 34 |
3 files changed, 46 insertions, 46 deletions
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 @@ | |||
83 | <Compile Include="Prebuild.cs"> | 83 | <Compile Include="Prebuild.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="Core\FatalException.cs"> | ||
87 | <SubType>Code</SubType> | ||
88 | </Compile> | ||
89 | <Compile Include="Core\Kernel.cs"> | 86 | <Compile Include="Core\Kernel.cs"> |
90 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
91 | </Compile> | 88 | </Compile> |
@@ -95,19 +92,25 @@ | |||
95 | <Compile Include="Core\WarningException.cs"> | 92 | <Compile Include="Core\WarningException.cs"> |
96 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
97 | </Compile> | 94 | </Compile> |
98 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> | 95 | <Compile Include="Core\FatalException.cs"> |
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="Core\Interfaces\ITarget.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="Core\Interfaces\IDataNode.cs"> | ||
99 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
100 | </Compile> | 103 | </Compile> |
101 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> | 104 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> |
102 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
103 | </Compile> | 106 | </Compile> |
104 | <Compile Include="Core\Attributes\TargetAttribute.cs"> | 107 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> |
105 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
106 | </Compile> | 109 | </Compile> |
107 | <Compile Include="Core\Interfaces\IDataNode.cs"> | 110 | <Compile Include="Core\Attributes\TargetAttribute.cs"> |
108 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
109 | </Compile> | 112 | </Compile> |
110 | <Compile Include="Core\Interfaces\ITarget.cs"> | 113 | <Compile Include="Core\Nodes\ProjectNode.cs"> |
111 | <SubType>Code</SubType> | 114 | <SubType>Code</SubType> |
112 | </Compile> | 115 | </Compile> |
113 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> | 116 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> |
@@ -119,76 +122,73 @@ | |||
119 | <Compile Include="Core\Nodes\ExcludeNode.cs"> | 122 | <Compile Include="Core\Nodes\ExcludeNode.cs"> |
120 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
121 | </Compile> | 124 | </Compile> |
122 | <Compile Include="Core\Nodes\FileNode.cs"> | 125 | <Compile Include="Core\Nodes\OptionsNode.cs"> |
123 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
124 | </Compile> | 127 | </Compile> |
125 | <Compile Include="Core\Nodes\FilesNode.cs"> | 128 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> |
126 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
127 | </Compile> | 130 | </Compile> |
128 | <Compile Include="Core\Nodes\MatchNode.cs"> | 131 | <Compile Include="Core\Nodes\MatchNode.cs"> |
129 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
130 | </Compile> | 133 | </Compile> |
131 | <Compile Include="Core\Nodes\OptionsNode.cs"> | 134 | <Compile Include="Core\Nodes\SolutionNode.cs"> |
132 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
133 | </Compile> | 136 | </Compile> |
134 | <Compile Include="Core\Nodes\ProcessNode.cs"> | 137 | <Compile Include="Core\Nodes\ProcessNode.cs"> |
135 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
136 | </Compile> | 139 | </Compile> |
137 | <Compile Include="Core\Nodes\ProjectNode.cs"> | ||
138 | <SubType>Code</SubType> | ||
139 | </Compile> | ||
140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> | 140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> | 143 | <Compile Include="Core\Nodes\FileNode.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="Core\Nodes\SolutionNode.cs"> | 146 | <Compile Include="Core\Nodes\FilesNode.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="Core\Parse\IfContext.cs"> | 149 | <Compile Include="Core\Targets\DebugTarget.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="Core\Parse\Preprocessor.cs"> | 152 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> | 155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> |
156 | <SubType>Code</SubType> | 156 | <SubType>Code</SubType> |
157 | </Compile> | 157 | </Compile> |
158 | <Compile Include="Core\Targets\DebugTarget.cs"> | 158 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> |
159 | <SubType>Code</SubType> | 159 | <SubType>Code</SubType> |
160 | </Compile> | 160 | </Compile> |
161 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> | 161 | <Compile Include="Core\Targets\VS2002Target.cs"> |
162 | <SubType>Code</SubType> | 162 | <SubType>Code</SubType> |
163 | </Compile> | 163 | </Compile> |
164 | <Compile Include="Core\Targets\NAntTarget.cs"> | 164 | <Compile Include="Core\Targets\VS2003Target.cs"> |
165 | <SubType>Code</SubType> | 165 | <SubType>Code</SubType> |
166 | </Compile> | 166 | </Compile> |
167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> | 167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> |
168 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
169 | </Compile> | 169 | </Compile> |
170 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> | 170 | <Compile Include="Core\Targets\VS2005Target.cs"> |
171 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
172 | </Compile> | 172 | </Compile> |
173 | <Compile Include="Core\Targets\VS2002Target.cs"> | 173 | <Compile Include="Core\Targets\NAntTarget.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | <Compile Include="Core\Targets\VS2003Target.cs"> | 176 | <Compile Include="Core\Parse\IfContext.cs"> |
177 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
178 | </Compile> | 178 | </Compile> |
179 | <Compile Include="Core\Targets\VS2005Target.cs"> | 179 | <Compile Include="Core\Parse\Preprocessor.cs"> |
180 | <SubType>Code</SubType> | 180 | <SubType>Code</SubType> |
181 | </Compile> | 181 | </Compile> |
182 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> | 182 | <Compile Include="Core\Utilities\Helper.cs"> |
183 | <SubType>Code</SubType> | 183 | <SubType>Code</SubType> |
184 | </Compile> | 184 | </Compile> |
185 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> | 185 | <Compile Include="Core\Utilities\Log.cs"> |
186 | <SubType>Code</SubType> | 186 | <SubType>Code</SubType> |
187 | </Compile> | 187 | </Compile> |
188 | <Compile Include="Core\Utilities\Helper.cs"> | 188 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> |
189 | <SubType>Code</SubType> | 189 | <SubType>Code</SubType> |
190 | </Compile> | 190 | </Compile> |
191 | <Compile Include="Core\Utilities\Log.cs"> | 191 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> |
192 | <SubType>Code</SubType> | 192 | <SubType>Code</SubType> |
193 | </Compile> | 193 | </Compile> |
194 | <Compile Include="Properties\AssemblyInfo.cs"> | 194 | <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 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> | 5 | <ReferencePath>C:\sugilite\bin\</ReferencePath> |
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | 6 | <LastOpenVersion>8.0.50727</LastOpenVersion> |
7 | <ProjectView>ProjectFiles</ProjectView> | 7 | <ProjectView>ProjectFiles</ProjectView> |
8 | <ProjectTrust>0</ProjectTrust> | 8 | <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 @@ | |||
14 | </resources> | 14 | </resources> |
15 | <sources failonempty="true"> | 15 | <sources failonempty="true"> |
16 | <include name="Prebuild.cs" /> | 16 | <include name="Prebuild.cs" /> |
17 | <include name="Core/FatalException.cs" /> | ||
18 | <include name="Core/Kernel.cs" /> | 17 | <include name="Core/Kernel.cs" /> |
19 | <include name="Core/UnknownLanguageException.cs" /> | 18 | <include name="Core/UnknownLanguageException.cs" /> |
20 | <include name="Core/WarningException.cs" /> | 19 | <include name="Core/WarningException.cs" /> |
21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 20 | <include name="Core/FatalException.cs" /> |
21 | <include name="Core/Interfaces/ITarget.cs" /> | ||
22 | <include name="Core/Interfaces/IDataNode.cs" /> | ||
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | 23 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> |
24 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | ||
23 | <include name="Core/Attributes/TargetAttribute.cs" /> | 25 | <include name="Core/Attributes/TargetAttribute.cs" /> |
24 | <include name="Core/Interfaces/IDataNode.cs" /> | 26 | <include name="Core/Nodes/ProjectNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | ||
26 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 27 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
27 | <include name="Core/Nodes/DataNode.cs" /> | 28 | <include name="Core/Nodes/DataNode.cs" /> |
28 | <include name="Core/Nodes/ExcludeNode.cs" /> | 29 | <include name="Core/Nodes/ExcludeNode.cs" /> |
29 | <include name="Core/Nodes/FileNode.cs" /> | ||
30 | <include name="Core/Nodes/FilesNode.cs" /> | ||
31 | <include name="Core/Nodes/MatchNode.cs" /> | ||
32 | <include name="Core/Nodes/OptionsNode.cs" /> | 30 | <include name="Core/Nodes/OptionsNode.cs" /> |
33 | <include name="Core/Nodes/ProcessNode.cs" /> | ||
34 | <include name="Core/Nodes/ProjectNode.cs" /> | ||
35 | <include name="Core/Nodes/ReferenceNode.cs" /> | ||
36 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 31 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
32 | <include name="Core/Nodes/MatchNode.cs" /> | ||
37 | <include name="Core/Nodes/SolutionNode.cs" /> | 33 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | 34 | <include name="Core/Nodes/ProcessNode.cs" /> |
39 | <include name="Core/Parse/Preprocessor.cs" /> | 35 | <include name="Core/Nodes/ReferenceNode.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 36 | <include name="Core/Nodes/FileNode.cs" /> |
37 | <include name="Core/Nodes/FilesNode.cs" /> | ||
41 | <include name="Core/Targets/DebugTarget.cs" /> | 38 | <include name="Core/Targets/DebugTarget.cs" /> |
42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 39 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
43 | <include name="Core/Targets/NAntTarget.cs" /> | 40 | <include name="Core/Targets/AutotoolsTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 41 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
46 | <include name="Core/Targets/VS2002Target.cs" /> | 42 | <include name="Core/Targets/VS2002Target.cs" /> |
47 | <include name="Core/Targets/VS2003Target.cs" /> | 43 | <include name="Core/Targets/VS2003Target.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
48 | <include name="Core/Targets/VS2005Target.cs" /> | 45 | <include name="Core/Targets/VS2005Target.cs" /> |
49 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 46 | <include name="Core/Targets/NAntTarget.cs" /> |
50 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 47 | <include name="Core/Parse/IfContext.cs" /> |
48 | <include name="Core/Parse/Preprocessor.cs" /> | ||
51 | <include name="Core/Utilities/Helper.cs" /> | 49 | <include name="Core/Utilities/Helper.cs" /> |
52 | <include name="Core/Utilities/Log.cs" /> | 50 | <include name="Core/Utilities/Log.cs" /> |
51 | <include name="Core/Utilities/CommandLineCollection.cs" /> | ||
52 | <include name="Core/Utilities/CurrentDirectory.cs" /> | ||
53 | <include name="Properties/AssemblyInfo.cs" /> | 53 | <include name="Properties/AssemblyInfo.cs" /> |
54 | </sources> | 54 | </sources> |
55 | <references basedir="${project::get-base-directory()}"> | 55 | <references basedir="${project::get-base-directory()}"> |