aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/EstateSettings.cs275
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs76
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs2
3 files changed, 29 insertions, 324 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 35ade66..0cab498 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -60,25 +60,9 @@ namespace OpenSim.Framework
60 private int m_redirectGridY; 60 private int m_redirectGridY;
61 private float m_sunHour; 61 private float m_sunHour;
62 private LLVector3 m_sunPosition; 62 private LLVector3 m_sunPosition;
63 private LLUUID m_terrainBase0;
64 private LLUUID m_terrainBase1;
65 private LLUUID m_terrainBase2;
66 private LLUUID m_terrainBase3;
67 private LLUUID m_terrainDetail0;
68 private LLUUID m_terrainDetail1;
69 private LLUUID m_terrainDetail2;
70 private LLUUID m_terrainDetail3;
71 private string m_terrainFile; 63 private string m_terrainFile;
72 private float m_terrainHeightRange0;
73 private float m_terrainHeightRange1;
74 private float m_terrainHeightRange2;
75 private float m_terrainHeightRange3;
76 private LLUUID m_terrainImageID; 64 private LLUUID m_terrainImageID;
77 private double m_terrainMultiplier; 65 private double m_terrainMultiplier;
78 private float m_terrainStartHeight0;
79 private float m_terrainStartHeight1;
80 private float m_terrainStartHeight2;
81 private float m_terrainStartHeight3;
82 66
83 public EstateSettings() 67 public EstateSettings()
84 { 68 {
@@ -172,179 +156,8 @@ namespace OpenSim.Framework
172 } 156 }
173 157
174 158
175 // Region Information
176 // Low resolution 'base' textures. No longer used.
177
178 public LLUUID terrainBase0
179 {
180 get { return m_terrainBase0; }
181 set
182 {
183 m_terrainBase0 = value;
184 configMember.forceSetConfigurationOption("terrain_base_0", m_terrainBase0.ToString());
185 }
186 }
187
188 public LLUUID terrainBase1
189 {
190 get { return m_terrainBase1; }
191 set
192 {
193 m_terrainBase1 = value;
194 configMember.forceSetConfigurationOption("terrain_base_1", m_terrainBase1.ToString());
195 }
196 }
197
198 public LLUUID terrainBase2
199 {
200 get { return m_terrainBase2; }
201 set
202 {
203 m_terrainBase2 = value;
204 configMember.forceSetConfigurationOption("terrain_base_2", m_terrainBase2.ToString());
205 }
206 }
207
208 public LLUUID terrainBase3
209 {
210 get { return m_terrainBase3; }
211 set
212 {
213 m_terrainBase3 = value;
214 configMember.forceSetConfigurationOption("terrain_base_3", m_terrainBase3.ToString());
215 }
216 }
217
218
219 // Higher resolution terrain textures
220
221 public LLUUID terrainDetail0
222 {
223 get { return m_terrainDetail0; }
224 set
225 {
226 m_terrainDetail0 = value;
227 configMember.forceSetConfigurationOption("terrain_detail_0", m_terrainDetail0.ToString());
228 }
229 }
230
231 public LLUUID terrainDetail1
232 {
233 get { return m_terrainDetail1; }
234 set
235 {
236 m_terrainDetail1 = value;
237 configMember.forceSetConfigurationOption("terrain_detail_1", m_terrainDetail1.ToString());
238 }
239 }
240
241 public LLUUID terrainDetail2
242 {
243 get { return m_terrainDetail2; }
244 set
245 {
246 m_terrainDetail2 = value;
247 configMember.forceSetConfigurationOption("terrain_detail_2", m_terrainDetail2.ToString());
248 }
249 }
250
251 public LLUUID terrainDetail3
252 {
253 get { return m_terrainDetail3; }
254 set
255 {
256 m_terrainDetail3 = value;
257 configMember.forceSetConfigurationOption("terrain_detail_3", m_terrainDetail3.ToString());
258 }
259 }
260
261 // First quad - each point is bilinearly interpolated at each meter of terrain 159 // First quad - each point is bilinearly interpolated at each meter of terrain
262 160
263 public float terrainStartHeight0
264 {
265 get { return m_terrainStartHeight0; }
266 set
267 {
268 m_terrainStartHeight0 = value;
269 configMember.forceSetConfigurationOption("terrain_start_height_0", m_terrainStartHeight0.ToString());
270 }
271 }
272
273
274 public float terrainStartHeight1
275 {
276 get { return m_terrainStartHeight1; }
277 set
278 {
279 m_terrainStartHeight1 = value;
280 configMember.forceSetConfigurationOption("terrain_start_height_1", m_terrainStartHeight1.ToString());
281 }
282 }
283
284 public float terrainStartHeight2
285 {
286 get { return m_terrainStartHeight2; }
287 set
288 {
289 m_terrainStartHeight2 = value;
290 configMember.forceSetConfigurationOption("terrain_start_height_2", m_terrainStartHeight2.ToString());
291 }
292 }
293
294 public float terrainStartHeight3
295 {
296 get { return m_terrainStartHeight3; }
297 set
298 {
299 m_terrainStartHeight3 = value;
300 configMember.forceSetConfigurationOption("terrain_start_height_3", m_terrainStartHeight3.ToString());
301 }
302 }
303
304 // Second quad - also bilinearly interpolated.
305 // Terrain texturing is done that:
306 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
307
308 public float terrainHeightRange0
309 {
310 get { return m_terrainHeightRange0; }
311 set
312 {
313 m_terrainHeightRange0 = value;
314 configMember.forceSetConfigurationOption("terrain_height_range_0", m_terrainHeightRange0.ToString());
315 }
316 }
317
318 public float terrainHeightRange1
319 {
320 get { return m_terrainHeightRange1; }
321 set
322 {
323 m_terrainHeightRange1 = value;
324 configMember.forceSetConfigurationOption("terrain_height_range_1", m_terrainHeightRange1.ToString());
325 }
326 }
327
328 public float terrainHeightRange2
329 {
330 get { return m_terrainHeightRange2; }
331 set
332 {
333 m_terrainHeightRange2 = value;
334 configMember.forceSetConfigurationOption("terrain_height_range_2", m_terrainHeightRange2.ToString());
335 }
336 }
337
338 public float terrainHeightRange3
339 {
340 get { return m_terrainHeightRange3; }
341 set
342 {
343 m_terrainHeightRange3 = value;
344 configMember.forceSetConfigurationOption("terrain_height_range_3", m_terrainHeightRange3.ToString());
345 }
346 }
347
348 // Terrain Default (Must be in F32 Format!) 161 // Terrain Default (Must be in F32 Format!)
349 162
350 public string terrainFile 163 public string terrainFile
@@ -655,42 +468,6 @@ namespace OpenSim.Framework
655 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 468 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
656 String.Empty, "1", true); 469 String.Empty, "1", true);
657 470
658 configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
659 "b8d3965a-ad78-bf43-699b-bff8eca6c975", true);
660 configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
661 "abb783e6-3e93-26c0-248a-247666855da3", true);
662 configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
663 "179cdabd-398a-9b6b-1391-4dc333ba321f", true);
664 configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty,
665 "beb169c7-11ea-fff2-efe5-0f24dc881df2", true);
666
667 configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
668 String.Empty, "00000000-0000-0000-0000-000000000000", true);
669 configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
670 String.Empty, "00000000-0000-0000-0000-000000000000", true);
671 configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
672 String.Empty, "00000000-0000-0000-0000-000000000000", true);
673 configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
674 String.Empty, "00000000-0000-0000-0000-000000000000", true);
675
676 configMember.addConfigurationOption("terrain_start_height_0",
677 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
678 configMember.addConfigurationOption("terrain_start_height_1",
679 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
680 configMember.addConfigurationOption("terrain_start_height_2",
681 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
682 configMember.addConfigurationOption("terrain_start_height_3",
683 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true);
684
685 configMember.addConfigurationOption("terrain_height_range_0",
686 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
687 configMember.addConfigurationOption("terrain_height_range_1",
688 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
689 configMember.addConfigurationOption("terrain_height_range_2",
690 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
691 configMember.addConfigurationOption("terrain_height_range_3",
692 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true);
693
694 configMember.addConfigurationOption("terrain_file", 471 configMember.addConfigurationOption("terrain_file",
695 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty, 472 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty,
696 "default.r32", true); 473 "default.r32", true);
@@ -751,58 +528,6 @@ namespace OpenSim.Framework
751 m_pricePerMeter = Convert.ToInt32(configuration_result); 528 m_pricePerMeter = Convert.ToInt32(configuration_result);
752 break; 529 break;
753 530
754 case "terrain_base_0":
755 m_terrainBase0 = (LLUUID) configuration_result;
756 break;
757 case "terrain_base_1":
758 m_terrainBase1 = (LLUUID) configuration_result;
759 break;
760 case "terrain_base_2":
761 m_terrainBase2 = (LLUUID) configuration_result;
762 break;
763 case "terrain_base_3":
764 m_terrainBase3 = (LLUUID) configuration_result;
765 break;
766
767 case "terrain_detail_0":
768 m_terrainDetail0 = (LLUUID) configuration_result;
769 break;
770 case "terrain_detail_1":
771 m_terrainDetail1 = (LLUUID) configuration_result;
772 break;
773 case "terrain_detail_2":
774 m_terrainDetail2 = (LLUUID) configuration_result;
775 break;
776 case "terrain_detail_3":
777 m_terrainDetail3 = (LLUUID) configuration_result;
778 break;
779
780 case "terrain_start_height_0":
781 m_terrainStartHeight0 = (float) configuration_result;
782 break;
783 case "terrain_start_height_1":
784 m_terrainStartHeight1 = (float) configuration_result;
785 break;
786 case "terrain_start_height_2":
787 m_terrainStartHeight2 = (float) configuration_result;
788 break;
789 case "terrain_start_height_3":
790 m_terrainStartHeight3 = (float) configuration_result;
791 break;
792
793 case "terrain_height_range_0":
794 m_terrainHeightRange0 = (float) configuration_result;
795 break;
796 case "terrain_height_range_1":
797 m_terrainHeightRange1 = (float) configuration_result;
798 break;
799 case "terrain_height_range_2":
800 m_terrainHeightRange2 = (float) configuration_result;
801 break;
802 case "terrain_height_range_3":
803 m_terrainHeightRange3 = (float) configuration_result;
804 break;
805
806 case "terrain_file": 531 case "terrain_file":
807 m_terrainFile = (string) configuration_result; 532 m_terrainFile = (string) configuration_result;
808 break; 533 break;
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 15141e5..55896d4 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -106,35 +106,16 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
106 switch (corner) 106 switch (corner)
107 { 107 {
108 case 0: 108 case 0:
109 m_scene.RegionInfo.EstateSettings.terrainBase0 = texture; 109 m_scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
110 break; 110 break;
111 case 1: 111 case 1:
112 m_scene.RegionInfo.EstateSettings.terrainBase1 = texture; 112 m_scene.RegionInfo.RegionSettings.TerrainTexture2 = texture;
113 break; 113 break;
114 case 2: 114 case 2:
115 m_scene.RegionInfo.EstateSettings.terrainBase2 = texture; 115 m_scene.RegionInfo.RegionSettings.TerrainTexture3 = texture;
116 break; 116 break;
117 case 3: 117 case 3:
118 m_scene.RegionInfo.EstateSettings.terrainBase3 = texture; 118 m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
119 break;
120 }
121 }
122
123 public void setEstateTerrainDetailTexture(IClientAPI client, int corner, LLUUID textureUUID)
124 {
125 switch (corner)
126 {
127 case 0:
128 m_scene.RegionInfo.EstateSettings.terrainDetail0 = textureUUID;
129 break;
130 case 1:
131 m_scene.RegionInfo.EstateSettings.terrainDetail1 = textureUUID;
132 break;
133 case 2:
134 m_scene.RegionInfo.EstateSettings.terrainDetail2 = textureUUID;
135 break;
136 case 3:
137 m_scene.RegionInfo.EstateSettings.terrainDetail3 = textureUUID;
138 break; 119 break;
139 } 120 }
140 } 121 }
@@ -144,20 +125,20 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
144 switch (corner) 125 switch (corner)
145 { 126 {
146 case 0: 127 case 0:
147 m_scene.RegionInfo.EstateSettings.terrainStartHeight0 = lowValue; 128 m_scene.RegionInfo.RegionSettings.Elevation1SW = lowValue;
148 m_scene.RegionInfo.EstateSettings.terrainHeightRange0 = highValue; 129 m_scene.RegionInfo.RegionSettings.Elevation2SW = highValue;
149 break; 130 break;
150 case 1: 131 case 1:
151 m_scene.RegionInfo.EstateSettings.terrainStartHeight1 = lowValue; 132 m_scene.RegionInfo.RegionSettings.Elevation1NW = lowValue;
152 m_scene.RegionInfo.EstateSettings.terrainHeightRange1 = highValue; 133 m_scene.RegionInfo.RegionSettings.Elevation2NW = highValue;
153 break; 134 break;
154 case 2: 135 case 2:
155 m_scene.RegionInfo.EstateSettings.terrainStartHeight2 = lowValue; 136 m_scene.RegionInfo.RegionSettings.Elevation1SE = lowValue;
156 m_scene.RegionInfo.EstateSettings.terrainHeightRange2 = highValue; 137 m_scene.RegionInfo.RegionSettings.Elevation2SE = highValue;
157 break; 138 break;
158 case 3: 139 case 3:
159 m_scene.RegionInfo.EstateSettings.terrainStartHeight3 = lowValue; 140 m_scene.RegionInfo.RegionSettings.Elevation1NE = lowValue;
160 m_scene.RegionInfo.EstateSettings.terrainHeightRange3 = highValue; 141 m_scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
161 break; 142 break;
162 } 143 }
163 } 144 }
@@ -532,14 +513,14 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
532 args.isEstateManager = estatemanager; 513 args.isEstateManager = estatemanager;
533 514
534 args.billableFactor = m_scene.RegionInfo.EstateSettings.billableFactor; 515 args.billableFactor = m_scene.RegionInfo.EstateSettings.billableFactor;
535 args.terrainHeightRange0 = m_scene.RegionInfo.EstateSettings.terrainHeightRange0; 516 args.terrainStartHeight0 = (float)m_scene.RegionInfo.RegionSettings.Elevation1SW;
536 args.terrainHeightRange1 = m_scene.RegionInfo.EstateSettings.terrainHeightRange1; 517 args.terrainHeightRange0 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SW;
537 args.terrainHeightRange2 = m_scene.RegionInfo.EstateSettings.terrainHeightRange2; 518 args.terrainStartHeight1 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NW;
538 args.terrainHeightRange3 = m_scene.RegionInfo.EstateSettings.terrainHeightRange3; 519 args.terrainHeightRange1 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NW;
539 args.terrainStartHeight0 = m_scene.RegionInfo.EstateSettings.terrainStartHeight0; 520 args.terrainStartHeight2 = (float)m_scene.RegionInfo.RegionSettings.Elevation1SE;
540 args.terrainStartHeight1 = m_scene.RegionInfo.EstateSettings.terrainStartHeight1; 521 args.terrainHeightRange2 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SE;
541 args.terrainStartHeight2 = m_scene.RegionInfo.EstateSettings.terrainStartHeight2; 522 args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE;
542 args.terrainStartHeight3 = m_scene.RegionInfo.EstateSettings.terrainStartHeight3; 523 args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE;
543 byte mature = 13; 524 byte mature = 13;
544 if(m_scene.RegionInfo.RegionSettings.Maturity == 1) 525 if(m_scene.RegionInfo.RegionSettings.Maturity == 1)
545 mature = 21; 526 mature = 21;
@@ -549,14 +530,14 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
549 args.regionFlags = GetRegionFlags(); 530 args.regionFlags = GetRegionFlags();
550 args.regionName = m_scene.RegionInfo.RegionName; 531 args.regionName = m_scene.RegionInfo.RegionName;
551 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; 532 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
552 args.terrainBase0 = m_scene.RegionInfo.EstateSettings.terrainBase0; 533 args.terrainBase0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1;
553 args.terrainBase1 = m_scene.RegionInfo.EstateSettings.terrainBase1; 534 args.terrainBase1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2;
554 args.terrainBase2 = m_scene.RegionInfo.EstateSettings.terrainBase2; 535 args.terrainBase2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3;
555 args.terrainBase3 = m_scene.RegionInfo.EstateSettings.terrainBase3; 536 args.terrainBase3 = m_scene.RegionInfo.RegionSettings.TerrainTexture4;
556 args.terrainDetail0 = m_scene.RegionInfo.EstateSettings.terrainDetail0; 537 args.terrainDetail0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1;
557 args.terrainDetail1 = m_scene.RegionInfo.EstateSettings.terrainDetail1; 538 args.terrainDetail1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2;
558 args.terrainDetail2 = m_scene.RegionInfo.EstateSettings.terrainDetail2; 539 args.terrainDetail2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3;
559 args.terrainDetail3 = m_scene.RegionInfo.EstateSettings.terrainDetail3; 540 args.terrainDetail3 = m_scene.RegionInfo.RegionSettings.TerrainTexture4;
560 541
561 remoteClient.SendRegionHandshake(m_scene.RegionInfo,args); 542 remoteClient.SendRegionHandshake(m_scene.RegionInfo,args);
562 } 543 }
@@ -617,7 +598,6 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
617 client.OnDetailedEstateDataRequest += sendDetailedEstateData; 598 client.OnDetailedEstateDataRequest += sendDetailedEstateData;
618 client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler; 599 client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler;
619 client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture; 600 client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture;
620 client.OnSetEstateTerrainDetailTexture += setEstateTerrainDetailTexture;
621 client.OnSetEstateTerrainTextureHeights += setEstateTerrainTextureHeights; 601 client.OnSetEstateTerrainTextureHeights += setEstateTerrainTextureHeights;
622 client.OnCommitEstateTerrainTextureRequest += handleCommitEstateTerrainTextureRequest; 602 client.OnCommitEstateTerrainTextureRequest += handleCommitEstateTerrainTextureRequest;
623 client.OnSetRegionTerrainSettings += setRegionTerrainSettings; 603 client.OnSetRegionTerrainSettings += setRegionTerrainSettings;
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 4a5948f..e52896a 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
300 { 300 {
301 if (over.landData.localID == landData.localID) 301 if (over.landData.localID == landData.localID)
302 { 302 {
303 if ((over.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) 303 if (((over.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage)
304 avatars[i].Invulnerable = false; 304 avatars[i].Invulnerable = false;
305 else 305 else
306 avatars[i].Invulnerable = true; 306 avatars[i].Invulnerable = true;
generated by cgit v1.1 at 2024-11-11 22:15:30 +0000