aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2008-06-29 11:48:58 +0000
committerMW2008-06-29 11:48:58 +0000
commitf3f31744abaf8a9df952a0d547faa59035b46ff3 (patch)
treed400f1ef6854d9f7b57007f92e774b5c7b1a1c81 /OpenSim/Framework
parentcouple of small fixes to try to fix support for multiple inventory servers in... (diff)
downloadopensim-SC_OLD-f3f31744abaf8a9df952a0d547faa59035b46ff3.zip
opensim-SC_OLD-f3f31744abaf8a9df952a0d547faa59035b46ff3.tar.gz
opensim-SC_OLD-f3f31744abaf8a9df952a0d547faa59035b46ff3.tar.bz2
opensim-SC_OLD-f3f31744abaf8a9df952a0d547faa59035b46ff3.tar.xz
patch and files from mantis #1630, Thanks Melanie
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/RegionSettings.cs300
2 files changed, 301 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 45f692b..ccd6491 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Framework.Communications
134 134
135 public bool TryGetInventoryService(string host, out IInventoryServices inventoryService) 135 public bool TryGetInventoryService(string host, out IInventoryServices inventoryService)
136 { 136 {
137 if ((host == string.Empty) | (host == "default")) 137 if ((host == string.Empty) || (host == "default"))
138 { 138 {
139 host = m_defaultInventoryHost; 139 host = m_defaultInventoryHost;
140 } 140 }
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
new file mode 100644
index 0000000..caadfd4
--- /dev/null
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -0,0 +1,300 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.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
28using System;
29using libsecondlife;
30using log4net;
31
32namespace OpenSim.Framework
33{
34 public class RegionSettings
35 {
36 private LLUUID m_RegionUUID;
37
38 public LLUUID RegionUUID
39 {
40 get { return m_RegionUUID; }
41 set { m_RegionUUID = value; }
42 }
43
44 private bool m_BlockTerraform;
45
46 public bool BlockTerraform
47 {
48 get { return m_BlockTerraform; }
49 set { m_BlockTerraform = value; }
50 }
51
52 private bool m_BlockFly;
53
54 public bool BlockFly
55 {
56 get { return m_BlockFly; }
57 set { m_BlockFly = value; }
58 }
59
60 private bool m_AllowDamage;
61
62 public bool AllowDamage
63 {
64 get { return m_AllowDamage; }
65 set { m_AllowDamage = value; }
66 }
67
68 private bool m_RestrictPushing;
69
70 public bool RestrictPushing
71 {
72 get { return m_RestrictPushing; }
73 set { m_RestrictPushing = value; }
74 }
75
76 private bool m_AllowLandResell;
77
78 public bool AllowLandResell
79 {
80 get { return m_AllowLandResell; }
81 set { m_AllowLandResell = value; }
82 }
83
84 private bool m_AllowLandJoinDivide;
85
86 public bool AllowLandJoinDivide
87 {
88 get { return m_AllowLandJoinDivide; }
89 set { m_AllowLandJoinDivide = value; }
90 }
91
92 private bool m_BlockShowInSearch;
93
94 public bool BlockShowInSearch
95 {
96 get { return m_BlockShowInSearch; }
97 set { m_BlockShowInSearch = value; }
98 }
99
100 private int m_AgentLimit;
101
102 public int AgentLimit
103 {
104 get { return m_AgentLimit; }
105 set { m_AgentLimit = value; }
106 }
107
108 private double m_ObjectBonus;
109
110 public double ObjectBonus
111 {
112 get { return m_ObjectBonus; }
113 set { m_ObjectBonus = value; }
114 }
115
116 private int m_Maturity;
117
118 public int Maturity
119 {
120 get { return m_Maturity; }
121 set { m_Maturity = value; }
122 }
123
124 private bool m_DisableScripts;
125
126 public bool DisableScripts
127 {
128 get { return m_DisableScripts; }
129 set { m_DisableScripts = value; }
130 }
131
132 private bool m_DisableCollisions;
133
134 public bool DisableCollisions
135 {
136 get { return m_DisableCollisions; }
137 set { m_DisableCollisions = value; }
138 }
139
140 private bool m_DisablePhysics;
141
142 public bool DisablePhysics
143 {
144 get { return m_DisablePhysics; }
145 set { m_DisablePhysics = value; }
146 }
147
148 private LLUUID m_TerrainTexture1;
149
150 public LLUUID TerrainTexture1
151 {
152 get { return m_TerrainTexture1; }
153 set { m_TerrainTexture1 = value; }
154 }
155
156 private LLUUID m_TerrainTexture2;
157
158 public LLUUID TerrainTexture2
159 {
160 get { return m_TerrainTexture2; }
161 set { m_TerrainTexture2 = value; }
162 }
163
164 private LLUUID m_TerrainTexture3;
165
166 public LLUUID TerrainTexture3
167 {
168 get { return m_TerrainTexture3; }
169 set { m_TerrainTexture3 = value; }
170 }
171
172 private LLUUID m_TerrainTexture4;
173
174 public LLUUID TerrainTexture4
175 {
176 get { return m_TerrainTexture4; }
177 set { m_TerrainTexture4 = value; }
178 }
179
180 private double m_Elevation1NW;
181
182 public double Elevation1NW
183 {
184 get { return m_Elevation1NW; }
185 set { m_Elevation1NW = value; }
186 }
187
188 private double m_Elevation2NW;
189
190 public double Elevation2NW
191 {
192 get { return m_Elevation2NW; }
193 set { m_Elevation2NW = value; }
194 }
195
196 private double m_Elevation1NE;
197
198 public double Elevation1NE
199 {
200 get { return m_Elevation1NE; }
201 set { m_Elevation1NE = value; }
202 }
203
204 private double m_Elevation2NE;
205
206 public double Elevation2NE
207 {
208 get { return m_Elevation2NE; }
209 set { m_Elevation2NE = value; }
210 }
211
212 private double m_Elevation1SE;
213
214 public double Elevation1SE
215 {
216 get { return m_Elevation1SE; }
217 set { m_Elevation1SE = value; }
218 }
219
220 private double m_Elevation2SE;
221
222 public double Elevation2SE
223 {
224 get { return m_Elevation2SE; }
225 set { m_Elevation2SE = value; }
226 }
227
228 private double m_Elevation1SW;
229
230 public double Elevation1SW
231 {
232 get { return m_Elevation1SW; }
233 set { m_Elevation1SW = value; }
234 }
235
236 private double m_Elevation2SW;
237
238 public double Elevation2SW
239 {
240 get { return m_Elevation2SW; }
241 set { m_Elevation2SW = value; }
242 }
243
244 private double m_WaterHeight;
245
246 public double WaterHeight
247 {
248 get { return m_WaterHeight; }
249 set { m_WaterHeight = value; }
250 }
251
252 private double m_TerrainRaiseLimit;
253
254 public double TerrainRaiseLimit
255 {
256 get { return m_TerrainRaiseLimit; }
257 set { m_TerrainRaiseLimit = value; }
258 }
259
260 private double m_TerrainLowerLimit;
261
262 public double TerrainLowerLimit
263 {
264 get { return m_TerrainLowerLimit; }
265 set { m_TerrainLowerLimit = value; }
266 }
267
268 private bool m_UseEstateSun;
269
270 public bool UseEstateSun
271 {
272 get { return m_UseEstateSun; }
273 set { m_UseEstateSun = value; }
274 }
275
276 private bool m_FixedSun;
277
278 public bool FixedSun
279 {
280 get { return m_FixedSun; }
281 set { m_FixedSun = value; }
282 }
283
284 private double m_SunPosition;
285
286 public double SunPosition
287 {
288 get { return m_SunPosition; }
289 set { m_SunPosition = value; }
290 }
291
292 private LLUUID m_Covenant;
293
294 public LLUUID Covenant
295 {
296 get { return m_Covenant; }
297 set { m_Covenant = value; }
298 }
299 }
300}