diff options
author | Adam Frisby | 2007-07-21 07:29:37 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-21 07:29:37 +0000 |
commit | 2c90c6102037e0b0332fd8fe2a48627dee80158a (patch) | |
tree | 87b557a68ba87e8bd34302705e3724556752a391 /OpenSim/Region | |
parent | * Issue#209 - Terrain Hills Patch (Thanks Babblefrog) (diff) | |
download | opensim-SC_OLD-2c90c6102037e0b0332fd8fe2a48627dee80158a.zip opensim-SC_OLD-2c90c6102037e0b0332fd8fe2a48627dee80158a.tar.gz opensim-SC_OLD-2c90c6102037e0b0332fd8fe2a48627dee80158a.tar.bz2 opensim-SC_OLD-2c90c6102037e0b0332fd8fe2a48627dee80158a.tar.xz |
* Issue#206 - Casting of a LLUUID from XMLRPC hashtable causes an error. (Thanks Babblefrog)
* Issue#205 - MySQLManager User Creation support readded (Thanks Babblefrog + adjohn)
* Issue#204 - Clients now recieve terrain updates properly (Thanks Babblefrog) [May do some slight modifications on this to make it an event]
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index a660d82..acd7f3f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -235,6 +235,27 @@ namespace OpenSim.Region.Environment.Scenes | |||
235 | storageCount = 0; | 235 | storageCount = 0; |
236 | } | 236 | } |
237 | 237 | ||
238 | if (Terrain.tainted > 0) | ||
239 | { | ||
240 | lock (m_syncRoot) | ||
241 | { | ||
242 | phyScene.SetTerrain(Terrain.getHeights1D()); | ||
243 | } | ||
244 | |||
245 | storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD()); | ||
246 | |||
247 | ForEachScenePresence(delegate(ScenePresence presence) | ||
248 | { | ||
249 | SendLayerData(presence.ControllingClient); | ||
250 | }); | ||
251 | |||
252 | foreach (LLUUID UUID in Entities.Keys) | ||
253 | { | ||
254 | Entities[UUID].LandRenegerated(); | ||
255 | } | ||
256 | Terrain.tainted = 0; | ||
257 | } | ||
258 | |||
238 | landPrimCheckCount++; | 259 | landPrimCheckCount++; |
239 | if (landPrimCheckCount > 50) //check every 5 seconds for tainted prims | 260 | if (landPrimCheckCount > 50) //check every 5 seconds for tainted prims |
240 | { | 261 | { |
@@ -559,6 +580,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
559 | client.OnObjectName += PrimName; | 580 | client.OnObjectName += PrimName; |
560 | client.OnLinkObjects += LinkObjects; | 581 | client.OnLinkObjects += LinkObjects; |
561 | client.OnObjectDuplicate += DuplicateObject; | 582 | client.OnObjectDuplicate += DuplicateObject; |
583 | client.OnModifyTerrain += ModifyTerrain; | ||
562 | 584 | ||
563 | client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_LandManager.handleParcelPropertiesRequest); | 585 | client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_LandManager.handleParcelPropertiesRequest); |
564 | client.OnParcelDivideRequest += new ParcelDivideRequest(m_LandManager.handleParcelDivideRequest); | 586 | client.OnParcelDivideRequest += new ParcelDivideRequest(m_LandManager.handleParcelDivideRequest); |
@@ -969,4 +991,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
969 | } | 991 | } |
970 | #endregion | 992 | #endregion |
971 | } | 993 | } |
972 | } \ No newline at end of file | 994 | } |