diff options
author | Teravus Ovares | 2007-11-25 04:52:14 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-25 04:52:14 +0000 |
commit | d263a044b1ebb13477b2b391637ccc2da4368838 (patch) | |
tree | 6288ef8e8f2a1c073705b23db8aba8603a28c34d /OpenSim/Region/Environment/Scenes/SceneBase.cs | |
parent | Ignore nullreferenceexception in removeclient. The avatar is already gone. (diff) | |
download | opensim-SC_OLD-d263a044b1ebb13477b2b391637ccc2da4368838.zip opensim-SC_OLD-d263a044b1ebb13477b2b391637ccc2da4368838.tar.gz opensim-SC_OLD-d263a044b1ebb13477b2b391637ccc2da4368838.tar.bz2 opensim-SC_OLD-d263a044b1ebb13477b2b391637ccc2da4368838.tar.xz |
* Added the ability to restart your individual sims from within them using the estate tools.
* The sims properly restart, however they don't yet notify the existing avatars that they are up. To see the sim again, you'll need to log-out and back in until I can figure out how to get the proper data to the sims and to the avatar so they reconnect again.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 1bb7d10..4359374 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Timers; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
@@ -37,6 +38,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
37 | { | 38 | { |
38 | public abstract class SceneBase : IScene | 39 | public abstract class SceneBase : IScene |
39 | { | 40 | { |
41 | #region Events | ||
42 | |||
43 | public event restart OnRestart; | ||
44 | public event regionup OnRegionUp; | ||
45 | |||
46 | #endregion | ||
47 | |||
40 | #region Fields | 48 | #region Fields |
41 | private readonly ClientManager m_clientManager = new ClientManager(); | 49 | private readonly ClientManager m_clientManager = new ClientManager(); |
42 | 50 | ||
@@ -48,6 +56,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
48 | protected ulong m_regionHandle; | 56 | protected ulong m_regionHandle; |
49 | protected string m_regionName; | 57 | protected string m_regionName; |
50 | protected RegionInfo m_regInfo; | 58 | protected RegionInfo m_regInfo; |
59 | protected RegionStatus m_regStatus; | ||
51 | 60 | ||
52 | public TerrainEngine Terrain; | 61 | public TerrainEngine Terrain; |
53 | 62 | ||
@@ -69,6 +78,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
69 | set { m_assetCache = value; } | 78 | set { m_assetCache = value; } |
70 | } | 79 | } |
71 | 80 | ||
81 | public RegionStatus Region_Status | ||
82 | { | ||
83 | get { return m_regStatus; } | ||
84 | set { m_regStatus = value; } | ||
85 | } | ||
86 | |||
72 | #endregion | 87 | #endregion |
73 | 88 | ||
74 | #region Update Methods | 89 | #region Update Methods |
@@ -78,6 +93,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
78 | /// </summary> | 93 | /// </summary> |
79 | public abstract void Update(); | 94 | public abstract void Update(); |
80 | 95 | ||
96 | |||
97 | |||
81 | #endregion | 98 | #endregion |
82 | 99 | ||
83 | #region Terrain Methods | 100 | #region Terrain Methods |
@@ -130,6 +147,23 @@ namespace OpenSim.Region.Environment.Scenes | |||
130 | get { return m_nextLocalId++; } | 147 | get { return m_nextLocalId++; } |
131 | } | 148 | } |
132 | 149 | ||
150 | #region admin stuff | ||
151 | |||
152 | /// <summary> | ||
153 | /// Region Restart - Seconds till restart. | ||
154 | /// </summary> | ||
155 | /// <param name="seconds"></param> | ||
156 | public virtual void Restart(int seconds) | ||
157 | { | ||
158 | MainLog.Instance.Error("REGION", "passing Restart Message up the namespace"); | ||
159 | OnRestart(RegionInfo); | ||
160 | } | ||
161 | |||
162 | |||
163 | public abstract void OtherRegionUp(RegionInfo thisRegion); | ||
164 | |||
165 | |||
166 | #endregion | ||
133 | #region Shutdown | 167 | #region Shutdown |
134 | 168 | ||
135 | /// <summary> | 169 | /// <summary> |