diff options
author | Melanie Thielker | 2008-07-14 01:27:47 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-14 01:27:47 +0000 |
commit | e712678689f37f7a58e02547a5dbe6a214680db2 (patch) | |
tree | a7f13c72ca14860cfb2099fe0603878e57120d7d /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | Mantis#1728. Thank you kindly, Mikem for a patch that solves: (diff) | |
download | opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.zip opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.tar.gz opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.tar.bz2 opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.tar.xz |
Patch #9147
Patch #4 of the region settings series. Partial functionality of the new
storage system. More patches to follow.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index a78ad98..36a0ffc 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -297,24 +297,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
297 | m_httpListener = httpServer; | 297 | m_httpListener = httpServer; |
298 | m_dumpAssetsToFile = dumpAssetsToFile; | 298 | m_dumpAssetsToFile = dumpAssetsToFile; |
299 | 299 | ||
300 | if ((RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts) | 300 | m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts; |
301 | { | 301 | |
302 | m_scripts_enabled = false; | 302 | m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics; |
303 | } | ||
304 | else | ||
305 | { | ||
306 | m_scripts_enabled = true; | ||
307 | } | ||
308 | if ((RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipPhysics) == Simulator.RegionFlags.SkipPhysics) | ||
309 | { | ||
310 | m_physics_enabled = false; | ||
311 | } | ||
312 | else | ||
313 | { | ||
314 | m_physics_enabled = true; | ||
315 | } | ||
316 | 303 | ||
317 | m_statsReporter = new SimStatsReporter(regInfo); | 304 | m_statsReporter = new SimStatsReporter(this); |
318 | m_statsReporter.OnSendStatsResult += SendSimStatsPackets; | 305 | m_statsReporter.OnSendStatsResult += SendSimStatsPackets; |
319 | 306 | ||
320 | m_statsReporter.SetObjectCapacity(objectCapacity); | 307 | m_statsReporter.SetObjectCapacity(objectCapacity); |
@@ -1076,7 +1063,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1076 | //float tmpval = (float)hm[x, y]; | 1063 | //float tmpval = (float)hm[x, y]; |
1077 | float heightvalue = (float)hm[x, y]; | 1064 | float heightvalue = (float)hm[x, y]; |
1078 | 1065 | ||
1079 | if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight) | 1066 | if (heightvalue > (float)m_regInfo.RegionSettings.WaterHeight) |
1080 | { | 1067 | { |
1081 | // scale height value | 1068 | // scale height value |
1082 | heightvalue = low + mid * (heightvalue - low) / mid; | 1069 | heightvalue = low + mid * (heightvalue - low) / mid; |
@@ -1110,7 +1097,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1110 | else | 1097 | else |
1111 | { | 1098 | { |
1112 | // Y flip the cordinates | 1099 | // Y flip the cordinates |
1113 | heightvalue = m_regInfo.EstateSettings.waterHeight - heightvalue; | 1100 | heightvalue = (float)m_regInfo.RegionSettings.WaterHeight - heightvalue; |
1114 | if (heightvalue > 19) | 1101 | if (heightvalue > 19) |
1115 | heightvalue = 19; | 1102 | heightvalue = 19; |
1116 | if (heightvalue < 0) | 1103 | if (heightvalue < 0) |