aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-10 01:10:33 +0000
committerMelanie Thielker2008-10-10 01:10:33 +0000
commit96689723e5002075b45d01fe4243bf2d87d916b4 (patch)
tree5d8f9b35097da6657493db7b01738d55647dd31d /OpenSim/Region/Environment
parentFixed renaming of in-prim items (Mantis #2366) (diff)
downloadopensim-SC_OLD-96689723e5002075b45d01fe4243bf2d87d916b4.zip
opensim-SC_OLD-96689723e5002075b45d01fe4243bf2d87d916b4.tar.gz
opensim-SC_OLD-96689723e5002075b45d01fe4243bf2d87d916b4.tar.bz2
opensim-SC_OLD-96689723e5002075b45d01fe4243bf2d87d916b4.tar.xz
Add the beginnings of a sim health check (through remote admin)
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs14
2 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 616132b..7a9dc72 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -585,6 +585,11 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
585 args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; 585 args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
586 else 586 else
587 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; 587 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
588
589 // Fudge estate owner
590 if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remoteClient.AgentId))
591 args.SimOwner = remoteClient.AgentId;
592
588 args.terrainBase0 = UUID.Zero; 593 args.terrainBase0 = UUID.Zero;
589 args.terrainBase1 = UUID.Zero; 594 args.terrainBase1 = UUID.Zero;
590 args.terrainBase2 = UUID.Zero; 595 args.terrainBase2 = UUID.Zero;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 27c315c..8bd3642 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Region.Environment.Scenes
168 private bool m_physics_enabled = true; 168 private bool m_physics_enabled = true;
169 private bool m_scripts_enabled = true; 169 private bool m_scripts_enabled = true;
170 private string m_defaultScriptEngine; 170 private string m_defaultScriptEngine;
171 private int m_LastLogin = 0;
171 172
172 #endregion 173 #endregion
173 174
@@ -2142,6 +2143,7 @@ namespace OpenSim.Region.Environment.Scenes
2142 2143
2143 CreateAndAddScenePresence(client, child); 2144 CreateAndAddScenePresence(client, child);
2144 } 2145 }
2146 m_LastLogin = System.Environment.TickCount;
2145 EventManager.TriggerOnNewClient(client); 2147 EventManager.TriggerOnNewClient(client);
2146 } 2148 }
2147 2149
@@ -4258,5 +4260,17 @@ namespace OpenSim.Region.Environment.Scenes
4258 { 4260 {
4259 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); 4261 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
4260 } 4262 }
4263
4264 public int GetHealth()
4265 {
4266 int health=1; // Start at 1, means we're up
4267
4268 // A login in the last 4 mins? We can't be doing too badly
4269 //
4270 if ((System.Environment.TickCount - m_LastLogin) < 240000)
4271 health++;
4272
4273 return 0;
4274 }
4261 } 4275 }
4262} 4276}