Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 12 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 7ff3d40..e3e54e2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes
         #region Fields
 
         public string Name { get { return RegionInfo.RegionName; } }
-        
+
         public IConfigSource Config
         {
             get { return GetConfig(); }
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// The module commanders available from this scene
         /// </value>
         protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
-        
+
         /// <value>
         /// Registered classes that are capable of creating entities.
         /// </value>
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected uint m_lastAllocatedLocalId = 720000;
 
         private readonly Mutex _primAllocateMutex = new Mutex(false);
-        
+
         protected readonly ClientManager m_clientManager = new ClientManager();
 
         public bool LoginsEnabled
@@ -153,6 +153,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public ITerrainChannel Heightmap;
+        public ITerrainChannel Bakedmap;
 
         /// <value>
         /// Allows retrieval of land information for this scene.
@@ -200,7 +201,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// If -1 then updates until shutdown.
         /// </param>
         /// <returns>true if update completed within minimum frame time, false otherwise.</returns>
-        public abstract bool Update(int frames);
+        public abstract void Update(int frames);
 
         #endregion
 
@@ -263,7 +264,7 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual RegionInfo RegionInfo { get; private set; }
 
         #region admin stuff
-        
+
         public abstract void OtherRegionUp(GridRegion otherRegion);
 
         public virtual string GetSimulatorVersion()
@@ -286,7 +287,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             catch (Exception e)
             {
-                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));
+                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception {0}", e));
             }
         }
 
@@ -306,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             return myID;
         }
-        
+
         #region Module Methods
 
         /// <summary>
@@ -365,7 +366,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_moduleCommanders.ContainsKey(name))
                     return m_moduleCommanders[name];
             }
-            
+
             return null;
         }
 
@@ -415,7 +416,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void RegisterModuleInterface<M>(M mod)
         {
 //            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
-            
+
             List<Object> l = null;
             if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
             {
@@ -526,9 +527,9 @@ namespace OpenSim.Region.Framework.Scenes
                 return new T[] {};
             }
         }
-        
+
         #endregion
-        
+
         /// <summary>
         /// Call this from a region module to add a command to the OpenSim console.
         /// </summary>