diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 23 |
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 | |||
57 | #region Fields | 57 | #region Fields |
58 | 58 | ||
59 | public string Name { get { return RegionInfo.RegionName; } } | 59 | public string Name { get { return RegionInfo.RegionName; } } |
60 | 60 | ||
61 | public IConfigSource Config | 61 | public IConfigSource Config |
62 | { | 62 | { |
63 | get { return GetConfig(); } | 63 | get { return GetConfig(); } |
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
95 | /// The module commanders available from this scene | 95 | /// The module commanders available from this scene |
96 | /// </value> | 96 | /// </value> |
97 | protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>(); | 97 | protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>(); |
98 | 98 | ||
99 | /// <value> | 99 | /// <value> |
100 | /// Registered classes that are capable of creating entities. | 100 | /// Registered classes that are capable of creating entities. |
101 | /// </value> | 101 | /// </value> |
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
108 | protected uint m_lastAllocatedLocalId = 720000; | 108 | protected uint m_lastAllocatedLocalId = 720000; |
109 | 109 | ||
110 | private readonly Mutex _primAllocateMutex = new Mutex(false); | 110 | private readonly Mutex _primAllocateMutex = new Mutex(false); |
111 | 111 | ||
112 | protected readonly ClientManager m_clientManager = new ClientManager(); | 112 | protected readonly ClientManager m_clientManager = new ClientManager(); |
113 | 113 | ||
114 | public bool LoginsEnabled | 114 | public bool LoginsEnabled |
@@ -153,6 +153,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
153 | } | 153 | } |
154 | 154 | ||
155 | public ITerrainChannel Heightmap; | 155 | public ITerrainChannel Heightmap; |
156 | public ITerrainChannel Bakedmap; | ||
156 | 157 | ||
157 | /// <value> | 158 | /// <value> |
158 | /// Allows retrieval of land information for this scene. | 159 | /// Allows retrieval of land information for this scene. |
@@ -200,7 +201,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
200 | /// If -1 then updates until shutdown. | 201 | /// If -1 then updates until shutdown. |
201 | /// </param> | 202 | /// </param> |
202 | /// <returns>true if update completed within minimum frame time, false otherwise.</returns> | 203 | /// <returns>true if update completed within minimum frame time, false otherwise.</returns> |
203 | public abstract bool Update(int frames); | 204 | public abstract void Update(int frames); |
204 | 205 | ||
205 | #endregion | 206 | #endregion |
206 | 207 | ||
@@ -263,7 +264,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
263 | public virtual RegionInfo RegionInfo { get; private set; } | 264 | public virtual RegionInfo RegionInfo { get; private set; } |
264 | 265 | ||
265 | #region admin stuff | 266 | #region admin stuff |
266 | 267 | ||
267 | public abstract void OtherRegionUp(GridRegion otherRegion); | 268 | public abstract void OtherRegionUp(GridRegion otherRegion); |
268 | 269 | ||
269 | public virtual string GetSimulatorVersion() | 270 | public virtual string GetSimulatorVersion() |
@@ -286,7 +287,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
286 | } | 287 | } |
287 | catch (Exception e) | 288 | catch (Exception e) |
288 | { | 289 | { |
289 | m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e)); | 290 | m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception {0}", e)); |
290 | } | 291 | } |
291 | } | 292 | } |
292 | 293 | ||
@@ -306,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
306 | 307 | ||
307 | return myID; | 308 | return myID; |
308 | } | 309 | } |
309 | 310 | ||
310 | #region Module Methods | 311 | #region Module Methods |
311 | 312 | ||
312 | /// <summary> | 313 | /// <summary> |
@@ -365,7 +366,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
365 | if (m_moduleCommanders.ContainsKey(name)) | 366 | if (m_moduleCommanders.ContainsKey(name)) |
366 | return m_moduleCommanders[name]; | 367 | return m_moduleCommanders[name]; |
367 | } | 368 | } |
368 | 369 | ||
369 | return null; | 370 | return null; |
370 | } | 371 | } |
371 | 372 | ||
@@ -415,7 +416,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
415 | public void RegisterModuleInterface<M>(M mod) | 416 | public void RegisterModuleInterface<M>(M mod) |
416 | { | 417 | { |
417 | // m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M)); | 418 | // m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M)); |
418 | 419 | ||
419 | List<Object> l = null; | 420 | List<Object> l = null; |
420 | if (!ModuleInterfaces.TryGetValue(typeof(M), out l)) | 421 | if (!ModuleInterfaces.TryGetValue(typeof(M), out l)) |
421 | { | 422 | { |
@@ -526,9 +527,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
526 | return new T[] {}; | 527 | return new T[] {}; |
527 | } | 528 | } |
528 | } | 529 | } |
529 | 530 | ||
530 | #endregion | 531 | #endregion |
531 | 532 | ||
532 | /// <summary> | 533 | /// <summary> |
533 | /// Call this from a region module to add a command to the OpenSim console. | 534 | /// Call this from a region module to add a command to the OpenSim console. |
534 | /// </summary> | 535 | /// </summary> |