Force HandleTerrainUpdate message to set the terrain no matter what the timestamp. This temp fix allows the initial terrain update to be set.

dsg
Robert Adams 2011-04-04 11:26:10 -07:00
parent 2abffd867f
commit d71b49c2a4
1 changed files with 1 additions and 0 deletions

View File

@ -2230,6 +2230,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//m_log.DebugFormat("{0}: received Terrain update msg, with TS {1}, actorID {2}",LogHeader, lastUpdateTimeStamp, lastUpdateActorID); //m_log.DebugFormat("{0}: received Terrain update msg, with TS {1}, actorID {2}",LogHeader, lastUpdateTimeStamp, lastUpdateActorID);
//update the terrain if the incoming terrain data has an more recent timestamp //update the terrain if the incoming terrain data has an more recent timestamp
m_scene.RequestModuleInterface<ITerrainModule>().SetSyncInfo(0, m_scene.GetSyncActorID());
if (m_scene.RequestModuleInterface<ITerrainModule>().UpdateTerrianBySync(lastUpdateTimeStamp, lastUpdateActorID, msgData)) if (m_scene.RequestModuleInterface<ITerrainModule>().UpdateTerrianBySync(lastUpdateTimeStamp, lastUpdateActorID, msgData))
{ {
//m_scene.Heightmap.LoadFromXmlString(msgData); //m_scene.Heightmap.LoadFromXmlString(msgData);