diff options
author | mingchen | 2007-06-08 17:09:51 +0000 |
---|---|---|
committer | mingchen | 2007-06-08 17:09:51 +0000 |
commit | 93c36b8865915aed764eeaf2a4931ec26baf1c99 (patch) | |
tree | d96361b677adede640715d91dbb8d82f69169cf9 | |
parent | Updated OpenSim.Framework.Console with changes from trunk (also for now have ... (diff) | |
download | opensim-SC-93c36b8865915aed764eeaf2a4931ec26baf1c99.zip opensim-SC-93c36b8865915aed764eeaf2a4931ec26baf1c99.tar.gz opensim-SC-93c36b8865915aed764eeaf2a4931ec26baf1c99.tar.bz2 opensim-SC-93c36b8865915aed764eeaf2a4931ec26baf1c99.tar.xz |
*Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.csproj | 82 | ||||
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.dll.build | 60 | ||||
-rw-r--r-- | Common/OpenSim.Framework/Types/EstateSettings.cs | 96 | ||||
-rw-r--r-- | Common/OpenSim.Framework/Types/ParcelData.cs | 115 |
4 files changed, 292 insertions, 61 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index e2a850f..39ce0ff 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -90,48 +90,60 @@ | |||
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="RegionCommsHostBase.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
93 | <Compile Include="AgentInventory.cs"> | 96 | <Compile Include="AgentInventory.cs"> |
94 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
95 | </Compile> | 98 | </Compile> |
96 | <Compile Include="AuthenticateSessionBase.cs"> | 99 | <Compile Include="AuthenticateSessionBase.cs"> |
97 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
98 | </Compile> | 101 | </Compile> |
99 | <Compile Include="BlockingQueue.cs"> | 102 | <Compile Include="Util.cs"> |
100 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
101 | </Compile> | 104 | </Compile> |
102 | <Compile Include="IRegionCommsHost.cs"> | 105 | <Compile Include="Remoting.cs"> |
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | <Compile Include="UserProfileManagerBase.cs"> | ||
103 | <SubType>Code</SubType> | 109 | <SubType>Code</SubType> |
104 | </Compile> | 110 | </Compile> |
105 | <Compile Include="LoginService.cs"> | 111 | <Compile Include="LoginService.cs"> |
106 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
107 | </Compile> | 113 | </Compile> |
108 | <Compile Include="RegionCommsHostBase.cs"> | 114 | <Compile Include="IRegionCommsHost.cs"> |
109 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
110 | </Compile> | 116 | </Compile> |
111 | <Compile Include="Remoting.cs"> | 117 | <Compile Include="UserProfileManager.cs"> |
112 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
113 | </Compile> | 119 | </Compile> |
114 | <Compile Include="SimProfile.cs"> | 120 | <Compile Include="BlockingQueue.cs"> |
121 | <SubType>Code</SubType> | ||
122 | </Compile> | ||
123 | <Compile Include="UserProfile.cs"> | ||
115 | <SubType>Code</SubType> | 124 | <SubType>Code</SubType> |
116 | </Compile> | 125 | </Compile> |
117 | <Compile Include="SimProfileBase.cs"> | 126 | <Compile Include="SimProfileBase.cs"> |
118 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
119 | </Compile> | 128 | </Compile> |
120 | <Compile Include="UserProfile.cs"> | 129 | <Compile Include="SimProfile.cs"> |
121 | <SubType>Code</SubType> | 130 | <SubType>Code</SubType> |
122 | </Compile> | 131 | </Compile> |
123 | <Compile Include="UserProfileManager.cs"> | 132 | <Compile Include="Interfaces\LocalGridBase.cs"> |
124 | <SubType>Code</SubType> | 133 | <SubType>Code</SubType> |
125 | </Compile> | 134 | </Compile> |
126 | <Compile Include="UserProfileManagerBase.cs"> | 135 | <Compile Include="Interfaces\RemoteGridBase.cs"> |
127 | <SubType>Code</SubType> | 136 | <SubType>Code</SubType> |
128 | </Compile> | 137 | </Compile> |
129 | <Compile Include="Util.cs"> | 138 | <Compile Include="Interfaces\IUserServer.cs"> |
130 | <SubType>Code</SubType> | 139 | <SubType>Code</SubType> |
131 | </Compile> | 140 | </Compile> |
132 | <Compile Include="Interfaces\IAssetServer.cs"> | 141 | <Compile Include="Interfaces\IAssetServer.cs"> |
133 | <SubType>Code</SubType> | 142 | <SubType>Code</SubType> |
134 | </Compile> | 143 | </Compile> |
144 | <Compile Include="Interfaces\IWorld.cs"> | ||
145 | <SubType>Code</SubType> | ||
146 | </Compile> | ||
135 | <Compile Include="Interfaces\IClientAPI.cs"> | 147 | <Compile Include="Interfaces\IClientAPI.cs"> |
136 | <SubType>Code</SubType> | 148 | <SubType>Code</SubType> |
137 | </Compile> | 149 | </Compile> |
@@ -141,85 +153,79 @@ | |||
141 | <Compile Include="Interfaces\ILocalStorage.cs"> | 153 | <Compile Include="Interfaces\ILocalStorage.cs"> |
142 | <SubType>Code</SubType> | 154 | <SubType>Code</SubType> |
143 | </Compile> | 155 | </Compile> |
144 | <Compile Include="Interfaces\IUserServer.cs"> | 156 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> |
145 | <SubType>Code</SubType> | ||
146 | </Compile> | ||
147 | <Compile Include="Interfaces\IWorld.cs"> | ||
148 | <SubType>Code</SubType> | ||
149 | </Compile> | ||
150 | <Compile Include="Interfaces\LocalGridBase.cs"> | ||
151 | <SubType>Code</SubType> | 157 | <SubType>Code</SubType> |
152 | </Compile> | 158 | </Compile> |
153 | <Compile Include="Interfaces\RemoteGridBase.cs"> | 159 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> |
154 | <SubType>Code</SubType> | 160 | <SubType>Code</SubType> |
155 | </Compile> | 161 | </Compile> |
156 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 162 | <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> |
157 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
158 | </Compile> | 164 | </Compile> |
159 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 165 | <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> |
160 | <SubType>Code</SubType> | 166 | <SubType>Code</SubType> |
161 | </Compile> | 167 | </Compile> |
162 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 168 | <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> |
163 | <SubType>Code</SubType> | 169 | <SubType>Code</SubType> |
164 | </Compile> | 170 | </Compile> |
165 | <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> | 171 | <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> |
166 | <SubType>Code</SubType> | 172 | <SubType>Code</SubType> |
167 | </Compile> | 173 | </Compile> |
168 | <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> | 174 | <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> |
169 | <SubType>Code</SubType> | 175 | <SubType>Code</SubType> |
170 | </Compile> | 176 | </Compile> |
171 | <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> | 177 | <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> |
172 | <SubType>Code</SubType> | 178 | <SubType>Code</SubType> |
173 | </Compile> | 179 | </Compile> |
174 | <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> | 180 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
175 | <SubType>Code</SubType> | 181 | <SubType>Code</SubType> |
176 | </Compile> | 182 | </Compile> |
177 | <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> | 183 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
178 | <SubType>Code</SubType> | 184 | <SubType>Code</SubType> |
179 | </Compile> | 185 | </Compile> |
180 | <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> | 186 | <Compile Include="Interfaces\Config\IGridConfig.cs"> |
181 | <SubType>Code</SubType> | 187 | <SubType>Code</SubType> |
182 | </Compile> | 188 | </Compile> |
183 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> | 189 | <Compile Include="Properties\AssemblyInfo.cs"> |
184 | <SubType>Code</SubType> | 190 | <SubType>Code</SubType> |
185 | </Compile> | 191 | </Compile> |
186 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> | 192 | <Compile Include="Types\NeighbourInfo.cs"> |
187 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
188 | </Compile> | 194 | </Compile> |
189 | <Compile Include="Properties\AssemblyInfo.cs"> | 195 | <Compile Include="Types\NetworkServersInfo.cs"> |
190 | <SubType>Code</SubType> | 196 | <SubType>Code</SubType> |
191 | </Compile> | 197 | </Compile> |
192 | <Compile Include="Types\AgentCiruitData.cs"> | 198 | <Compile Include="Types\RegionInfo.cs"> |
193 | <SubType>Code</SubType> | 199 | <SubType>Code</SubType> |
194 | </Compile> | 200 | </Compile> |
195 | <Compile Include="Types\AgentWearable.cs"> | 201 | <Compile Include="Types\AgentWearable.cs"> |
196 | <SubType>Code</SubType> | 202 | <SubType>Code</SubType> |
197 | </Compile> | 203 | </Compile> |
198 | <Compile Include="Types\AssetBase.cs"> | 204 | <Compile Include="Types\PrimData.cs"> |
199 | <SubType>Code</SubType> | 205 | <SubType>Code</SubType> |
200 | </Compile> | 206 | </Compile> |
201 | <Compile Include="Types\AssetLandmark.cs"> | 207 | <Compile Include="Types\AssetStorage.cs"> |
202 | <SubType>Code</SubType> | 208 | <SubType>Code</SubType> |
203 | </Compile> | 209 | </Compile> |
204 | <Compile Include="Types\AssetStorage.cs"> | 210 | <Compile Include="Types\OSVector3.cs"> |
205 | <SubType>Code</SubType> | 211 | <SubType>Code</SubType> |
206 | </Compile> | 212 | </Compile> |
207 | <Compile Include="Types\Login.cs"> | 213 | <Compile Include="Types\AgentCiruitData.cs"> |
208 | <SubType>Code</SubType> | 214 | <SubType>Code</SubType> |
209 | </Compile> | 215 | </Compile> |
210 | <Compile Include="Types\NeighbourInfo.cs"> | 216 | <Compile Include="Types\Login.cs"> |
211 | <SubType>Code</SubType> | 217 | <SubType>Code</SubType> |
212 | </Compile> | 218 | </Compile> |
213 | <Compile Include="Types\NetworkServersInfo.cs"> | 219 | <Compile Include="Types\AssetLandmark.cs"> |
214 | <SubType>Code</SubType> | 220 | <SubType>Code</SubType> |
215 | </Compile> | 221 | </Compile> |
216 | <Compile Include="Types\OSVector3.cs"> | 222 | <Compile Include="Types\AssetBase.cs"> |
217 | <SubType>Code</SubType> | 223 | <SubType>Code</SubType> |
218 | </Compile> | 224 | </Compile> |
219 | <Compile Include="Types\PrimData.cs"> | 225 | <Compile Include="Types\ParcelData.cs"> |
220 | <SubType>Code</SubType> | 226 | <SubType>Code</SubType> |
221 | </Compile> | 227 | </Compile> |
222 | <Compile Include="Types\RegionInfo.cs"> | 228 | <Compile Include="Types\EstateSettings.cs"> |
223 | <SubType>Code</SubType> | 229 | <SubType>Code</SubType> |
224 | </Compile> | 230 | </Compile> |
225 | </ItemGroup> | 231 | </ItemGroup> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index 34be1c8..a75388f 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -11,39 +11,52 @@ | |||
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionCommsHostBase.cs" /> | ||
14 | <include name="AgentInventory.cs" /> | 15 | <include name="AgentInventory.cs" /> |
15 | <include name="BlockingQueue.cs" /> | 16 | <include name="AuthenticateSessionBase.cs" /> |
16 | <include name="HeightMapGenHills.cs" /> | 17 | <include name="Util.cs" /> |
17 | <include name="LoginService.cs" /> | ||
18 | <include name="Remoting.cs" /> | 18 | <include name="Remoting.cs" /> |
19 | <include name="SimProfile.cs" /> | ||
20 | <include name="SimProfileBase.cs" /> | ||
21 | <include name="UserProfile.cs" /> | ||
22 | <include name="UserProfileManager.cs" /> | ||
23 | <include name="UserProfileManagerBase.cs" /> | 19 | <include name="UserProfileManagerBase.cs" /> |
24 | <include name="Util.cs" /> | 20 | <include name="LoginService.cs" /> |
21 | <include name="IRegionCommsHost.cs" /> | ||
22 | <include name="UserProfileManager.cs" /> | ||
23 | <include name="BlockingQueue.cs" /> | ||
24 | <include name="UserProfile.cs" /> | ||
25 | <include name="SimProfileBase.cs" /> | ||
26 | <include name="SimProfile.cs" /> | ||
27 | <include name="Interfaces/LocalGridBase.cs" /> | ||
28 | <include name="Interfaces/RemoteGridBase.cs" /> | ||
29 | <include name="Interfaces/IUserServer.cs" /> | ||
25 | <include name="Interfaces/IAssetServer.cs" /> | 30 | <include name="Interfaces/IAssetServer.cs" /> |
31 | <include name="Interfaces/IWorld.cs" /> | ||
26 | <include name="Interfaces/IClientAPI.cs" /> | 32 | <include name="Interfaces/IClientAPI.cs" /> |
27 | <include name="Interfaces/IConfig.cs" /> | ||
28 | <include name="Interfaces/IGenericConfig.cs" /> | ||
29 | <include name="Interfaces/IGridConfig.cs" /> | ||
30 | <include name="Interfaces/IGridServer.cs" /> | 33 | <include name="Interfaces/IGridServer.cs" /> |
31 | <include name="Interfaces/ILocalStorage.cs" /> | 34 | <include name="Interfaces/ILocalStorage.cs" /> |
32 | <include name="Interfaces/IScriptAPI.cs" /> | 35 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> |
33 | <include name="Interfaces/IScriptEngine.cs" /> | 36 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> |
34 | <include name="Interfaces/IUserConfig.cs" /> | 37 | <include name="Interfaces/Remoting/IProxyServerHost.cs" /> |
35 | <include name="Interfaces/IUserServer.cs" /> | 38 | <include name="Interfaces/Remoting/IProxyServerClient.cs" /> |
36 | <include name="Interfaces/LocalGridBase.cs" /> | 39 | <include name="Interfaces/Remoting/IRegionGridClient.cs" /> |
37 | <include name="Interfaces/RemoteGridBase.cs" /> | 40 | <include name="Interfaces/Remoting/IGridServerHost.cs" /> |
41 | <include name="Interfaces/Remoting/IRegionSimHost.cs" /> | ||
42 | <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> | ||
43 | <include name="Interfaces/Config/IGenericConfig.cs" /> | ||
44 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
45 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
38 | <include name="Properties/AssemblyInfo.cs" /> | 46 | <include name="Properties/AssemblyInfo.cs" /> |
39 | <include name="Types/AgentCiruitData.cs" /> | ||
40 | <include name="Types/AssetBase.cs" /> | ||
41 | <include name="Types/AssetLandmark.cs" /> | ||
42 | <include name="Types/AssetStorage.cs" /> | ||
43 | <include name="Types/Login.cs" /> | ||
44 | <include name="Types/NeighbourInfo.cs" /> | 47 | <include name="Types/NeighbourInfo.cs" /> |
45 | <include name="Types/OSVector3.cs" /> | 48 | <include name="Types/NetworkServersInfo.cs" /> |
49 | <include name="Types/RegionInfo.cs" /> | ||
50 | <include name="Types/AgentWearable.cs" /> | ||
46 | <include name="Types/PrimData.cs" /> | 51 | <include name="Types/PrimData.cs" /> |
52 | <include name="Types/AssetStorage.cs" /> | ||
53 | <include name="Types/OSVector3.cs" /> | ||
54 | <include name="Types/AgentCiruitData.cs" /> | ||
55 | <include name="Types/Login.cs" /> | ||
56 | <include name="Types/AssetLandmark.cs" /> | ||
57 | <include name="Types/AssetBase.cs" /> | ||
58 | <include name="Types/ParcelData.cs" /> | ||
59 | <include name="Types/EstateSettings.cs" /> | ||
47 | </sources> | 60 | </sources> |
48 | <references basedir="${project::get-base-directory()}"> | 61 | <references basedir="${project::get-base-directory()}"> |
49 | <lib> | 62 | <lib> |
@@ -55,6 +68,7 @@ | |||
55 | <include name="../../bin/libsecondlife.dll" /> | 68 | <include name="../../bin/libsecondlife.dll" /> |
56 | <include name="../../bin/Db4objects.Db4o.dll" /> | 69 | <include name="../../bin/Db4objects.Db4o.dll" /> |
57 | <include name="../../bin/XMLRPC.dll" /> | 70 | <include name="../../bin/XMLRPC.dll" /> |
71 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | ||
58 | </references> | 72 | </references> |
59 | </csc> | 73 | </csc> |
60 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 74 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/Common/OpenSim.Framework/Types/EstateSettings.cs new file mode 100644 index 0000000..baa3eef --- /dev/null +++ b/Common/OpenSim.Framework/Types/EstateSettings.cs | |||
@@ -0,0 +1,96 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | |||
33 | using libsecondlife; | ||
34 | |||
35 | namespace OpenSim.Framework.Types | ||
36 | { | ||
37 | public class EstateSettings | ||
38 | { | ||
39 | //Settings to this island | ||
40 | public float billableFactor = (float)0.0; | ||
41 | public uint estateID = 0; | ||
42 | public uint parentEstateID = 0; | ||
43 | |||
44 | public byte maxAgents = 40; | ||
45 | public float objectBonusFactor = (float)1.0; | ||
46 | |||
47 | public int redirectGridX = 0; //?? | ||
48 | public int redirectGridY = 0; //?? | ||
49 | public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings | ||
50 | public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default. | ||
51 | public float sunHour = 0; | ||
52 | |||
53 | public float terrainRaiseLimit = 0; | ||
54 | public float terrainLowerLimit = 0; | ||
55 | |||
56 | public bool useFixedSun = false; | ||
57 | public int pricePerMeter = 1; | ||
58 | |||
59 | public ushort regionWaterHeight = 20; | ||
60 | public bool regionAllowTerraform = true; | ||
61 | |||
62 | // Region Information | ||
63 | // Low resolution 'base' textures. No longer used. | ||
64 | public LLUUID terrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default | ||
65 | public LLUUID terrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default | ||
66 | public LLUUID terrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default | ||
67 | public LLUUID terrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default | ||
68 | |||
69 | // Higher resolution terrain textures | ||
70 | public LLUUID terrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000"); | ||
71 | public LLUUID terrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000"); | ||
72 | public LLUUID terrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000"); | ||
73 | public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); | ||
74 | |||
75 | // First quad - each point is bilinearly interpolated at each meter of terrain | ||
76 | public float terrainStartHeight0 = 10.0f; | ||
77 | public float terrainStartHeight1 = 10.0f; | ||
78 | public float terrainStartHeight2 = 10.0f; | ||
79 | public float terrainStartHeight3 = 10.0f; | ||
80 | |||
81 | // Second quad - also bilinearly interpolated. | ||
82 | // Terrain texturing is done that: | ||
83 | // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] | ||
84 | public float terrainHeightRange0 = 60.0f; //00 | ||
85 | public float terrainHeightRange1 = 60.0f; //01 | ||
86 | public float terrainHeightRange2 = 60.0f; //10 | ||
87 | public float terrainHeightRange3 = 60.0f; //11 | ||
88 | |||
89 | // Terrain Default (Must be in F32 Format!) | ||
90 | public string terrainFile = "default.r32"; | ||
91 | public double terrainMultiplier = 60.0; | ||
92 | public float waterHeight = (float)20.0; | ||
93 | |||
94 | |||
95 | } | ||
96 | } | ||
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs new file mode 100644 index 0000000..40f128a --- /dev/null +++ b/Common/OpenSim.Framework/Types/ParcelData.cs | |||
@@ -0,0 +1,115 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Framework.Types | ||
34 | { | ||
35 | |||
36 | public class ParcelData | ||
37 | { | ||
38 | public byte[] parcelBitmapByteArray = new byte[512]; | ||
39 | public string parcelName = ""; | ||
40 | public string parcelDesc = ""; | ||
41 | public LLUUID ownerID = new LLUUID(); | ||
42 | public bool isGroupOwned = false; | ||
43 | public LLVector3 AABBMin = new LLVector3(); | ||
44 | public LLVector3 AABBMax = new LLVector3(); | ||
45 | public int area = 0; | ||
46 | public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned | ||
47 | public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID | ||
48 | public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category | ||
49 | public int claimDate = 0; //Unemplemented | ||
50 | public int claimPrice = 0; //Unemplemented | ||
51 | public LLUUID groupID = new LLUUID(); //Unemplemented | ||
52 | public int groupPrims = 0; //Unemplemented | ||
53 | public int salePrice = 0; //Unemeplemented. Parcels price. | ||
54 | public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None; | ||
55 | public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None; | ||
56 | public byte landingType = 0; | ||
57 | public byte mediaAutoScale = 0; | ||
58 | public LLUUID mediaID = LLUUID.Zero; | ||
59 | public int localID = 0; | ||
60 | public LLUUID globalID = new LLUUID(); | ||
61 | |||
62 | public string mediaURL = ""; | ||
63 | public string musicURL = ""; | ||
64 | public float passHours = 0; | ||
65 | public int passPrice = 0; | ||
66 | public LLUUID snapshotID = LLUUID.Zero; | ||
67 | public LLVector3 userLocation = new LLVector3(); | ||
68 | public LLVector3 userLookAt = new LLVector3(); | ||
69 | |||
70 | public ParcelData() | ||
71 | { | ||
72 | globalID = LLUUID.Random(); | ||
73 | } | ||
74 | |||
75 | public ParcelData Copy() | ||
76 | { | ||
77 | ParcelData parcelData = new ParcelData(); | ||
78 | |||
79 | parcelData.AABBMax = this.AABBMax; | ||
80 | parcelData.AABBMin = this.AABBMin; | ||
81 | parcelData.area = this.area; | ||
82 | parcelData.auctionID = this.auctionID; | ||
83 | parcelData.authBuyerID = this.authBuyerID; | ||
84 | parcelData.category = this.category; | ||
85 | parcelData.claimDate = this.claimDate; | ||
86 | parcelData.claimPrice = this.claimPrice; | ||
87 | parcelData.globalID = this.globalID; | ||
88 | parcelData.groupID = this.groupID; | ||
89 | parcelData.groupPrims = this.groupPrims; | ||
90 | parcelData.isGroupOwned = this.isGroupOwned; | ||
91 | parcelData.localID = this.localID; | ||
92 | parcelData.landingType = this.landingType; | ||
93 | parcelData.mediaAutoScale = this.mediaAutoScale; | ||
94 | parcelData.mediaID = this.mediaID; | ||
95 | parcelData.mediaURL = this.mediaURL; | ||
96 | parcelData.musicURL = this.musicURL; | ||
97 | parcelData.ownerID = this.ownerID; | ||
98 | parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone(); | ||
99 | parcelData.parcelDesc = this.parcelDesc; | ||
100 | parcelData.parcelFlags = this.parcelFlags; | ||
101 | parcelData.parcelName = this.parcelName; | ||
102 | parcelData.parcelStatus = this.parcelStatus; | ||
103 | parcelData.passHours = this.passHours; | ||
104 | parcelData.passPrice = this.passPrice; | ||
105 | parcelData.salePrice = this.salePrice; | ||
106 | parcelData.snapshotID = this.snapshotID; | ||
107 | parcelData.userLocation = this.userLocation; | ||
108 | parcelData.userLookAt = this.userLookAt; | ||
109 | |||
110 | return parcelData; | ||
111 | |||
112 | } | ||
113 | } | ||
114 | |||
115 | } | ||