diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 2a82237..0ac4ed4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -36,6 +36,7 @@ using OpenSim.Framework; | |||
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
39 | 40 | ||
40 | namespace OpenSim.Region.Framework.Scenes | 41 | namespace OpenSim.Region.Framework.Scenes |
41 | { | 42 | { |
@@ -91,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
91 | /// <value> | 92 | /// <value> |
92 | /// Registered classes that are capable of creating entities. | 93 | /// Registered classes that are capable of creating entities. |
93 | /// </value> | 94 | /// </value> |
94 | protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>(); | 95 | protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>(); |
95 | 96 | ||
96 | /// <summary> | 97 | /// <summary> |
97 | /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is | 98 | /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is |
@@ -227,7 +228,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
227 | return false; | 228 | return false; |
228 | } | 229 | } |
229 | 230 | ||
230 | public abstract bool OtherRegionUp(RegionInfo thisRegion); | 231 | public abstract void OtherRegionUp(GridRegion otherRegion); |
231 | 232 | ||
232 | public virtual string GetSimulatorVersion() | 233 | public virtual string GetSimulatorVersion() |
233 | { | 234 | { |
@@ -278,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
278 | _primAllocateMutex.ReleaseMutex(); | 279 | _primAllocateMutex.ReleaseMutex(); |
279 | 280 | ||
280 | return myID; | 281 | return myID; |
281 | } | 282 | } |
282 | 283 | ||
283 | #region Module Methods | 284 | #region Module Methods |
284 | 285 | ||
@@ -472,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
472 | /// <summary> | 473 | /// <summary> |
473 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. | 474 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. |
474 | /// </summary> | 475 | /// </summary> |
475 | /// <param name="showParams">What to show</param> | 476 | /// <param name="showParams">What to show</param> |
476 | public virtual void Show(string[] showParams) | 477 | public virtual void Show(string[] showParams) |
477 | { | 478 | { |
478 | switch (showParams[0]) | 479 | switch (showParams[0]) |
@@ -488,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
488 | } | 489 | } |
489 | break; | 490 | break; |
490 | } | 491 | } |
491 | } | 492 | } |
492 | 493 | ||
493 | public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) | 494 | public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) |
494 | { | 495 | { |