aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/EstateSettings.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-14 01:39:36 +0000
committerMelanie Thielker2008-07-14 01:39:36 +0000
commit07bd749ac56dc498610fc88e61cc7ab04047620e (patch)
tree7e1e8f017f1abe0f3dcc21c29bbae7bafb4b456f /OpenSim/Framework/EstateSettings.cs
parentPatch #9149 (diff)
downloadopensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.zip
opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.gz
opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.bz2
opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.xz
Patch #9150
Patch 7 of the region patches. Finish off the region parts of the estate dialog. Full user functionality. Terrain textures, heights, water, avatar counts, prim bonus, debug settings and region toggles can now be set from the dialog on a per-region basis. Estate stuff defaults to sane values where there are no defaults, to estate_settings.xml otherwise. Sun still b0rked :(
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/EstateSettings.cs87
1 files changed, 0 insertions, 87 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 0cab498..2865844 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -58,11 +58,6 @@ namespace OpenSim.Framework
58 private int m_pricePerMeter; 58 private int m_pricePerMeter;
59 private int m_redirectGridX; 59 private int m_redirectGridX;
60 private int m_redirectGridY; 60 private int m_redirectGridY;
61 private float m_sunHour;
62 private LLVector3 m_sunPosition;
63 private string m_terrainFile;
64 private LLUUID m_terrainImageID;
65 private double m_terrainMultiplier;
66 61
67 public EstateSettings() 62 public EstateSettings()
68 { 63 {
@@ -126,25 +121,6 @@ namespace OpenSim.Framework
126 } 121 }
127 } 122 }
128 123
129 public float sunHour
130 {
131 get { return m_sunHour; }
132 set
133 {
134 m_sunHour = value;
135 }
136 }
137
138 public LLVector3 sunPosition
139 {
140 get { return m_sunPosition; }
141 set
142 {
143 //Just set - does not need to be written to settings file
144 m_sunPosition = value;
145 }
146 }
147
148 public int pricePerMeter 124 public int pricePerMeter
149 { 125 {
150 get { return m_pricePerMeter; } 126 get { return m_pricePerMeter; }
@@ -155,45 +131,6 @@ namespace OpenSim.Framework
155 } 131 }
156 } 132 }
157 133
158
159 // First quad - each point is bilinearly interpolated at each meter of terrain
160
161 // Terrain Default (Must be in F32 Format!)
162
163 public string terrainFile
164 {
165 get { return m_terrainFile; }
166 set
167 {
168 m_terrainFile = value;
169 configMember.forceSetConfigurationOption("terrain_file", m_terrainFile.ToString());
170 }
171 }
172
173 public double terrainMultiplier
174 {
175 get { return m_terrainMultiplier; }
176 set
177 {
178 m_terrainMultiplier = value;
179 configMember.forceSetConfigurationOption("terrain_multiplier", m_terrainMultiplier.ToString());
180 }
181 }
182
183 public LLUUID terrainImageID
184 {
185 get { return m_terrainImageID; }
186 set
187 {
188 m_terrainImageID = value;
189 // I don't think there is a reason that this actually
190 // needs to be written back to the estate settings
191 // file.
192
193 // configMember.forceSetConfigurationOption("terrain_image_id", m_terrainImageID.ToString());
194 }
195 }
196
197 // Estate name 134 // Estate name
198 135
199 public string estateName 136 public string estateName
@@ -461,22 +398,11 @@ namespace OpenSim.Framework
461 "0", true); 398 "0", true);
462 configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty, 399 configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty,
463 "0", true); 400 "0", true);
464 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0",
465 true);
466 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty,
467 "false", true);
468 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 401 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
469 String.Empty, "1", true); 402 String.Empty, "1", true);
470 403
471 configMember.addConfigurationOption("terrain_file",
472 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty,
473 "default.r32", true);
474 configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
475 String.Empty, "60.0", true);
476 configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, String.Empty, 404 configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, String.Empty,
477 "20.0", true); 405 "20.0", true);
478 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
479 String.Empty, "00000000-0000-0000-0000-000000000000", true);
480 406
481 configMember.addConfigurationOption("estate_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 407 configMember.addConfigurationOption("estate_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
482 String.Empty, "TestEstate", true); 408 String.Empty, "TestEstate", true);
@@ -521,26 +447,13 @@ namespace OpenSim.Framework
521 case "redirect_grid_y": 447 case "redirect_grid_y":
522 m_redirectGridY = (int) configuration_result; 448 m_redirectGridY = (int) configuration_result;
523 break; 449 break;
524 case "sun_hour":
525 m_sunHour = (float) configuration_result;
526 break;
527 case "price_per_meter": 450 case "price_per_meter":
528 m_pricePerMeter = Convert.ToInt32(configuration_result); 451 m_pricePerMeter = Convert.ToInt32(configuration_result);
529 break; 452 break;
530 453
531 case "terrain_file":
532 m_terrainFile = (string) configuration_result;
533 break;
534 case "estate_name": 454 case "estate_name":
535 m_estateName = (string) configuration_result; 455 m_estateName = (string) configuration_result;
536 break; 456 break;
537 case "terrain_multiplier":
538 m_terrainMultiplier = Convert.ToDouble(configuration_result);
539 break;
540 case "terrain_image_id":
541 m_terrainImageID = (LLUUID) configuration_result;
542 break;
543
544 case "estate_manager_0": 457 case "estate_manager_0":
545 m_estateManager0 = (LLUUID) configuration_result; 458 m_estateManager0 = (LLUUID) configuration_result;
546 break; 459 break;