aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohan Berntsson2009-04-15 04:15:47 +0000
committerJohan Berntsson2009-04-15 04:15:47 +0000
commit119aeeed7d6310297090da0082a32193951b5b46 (patch)
tree669d7919feeb5ffa4a62a15b03ca2eee757cab9b
parentRenamed splitID in Scene and added comments on usage (diff)
downloadopensim-SC_OLD-119aeeed7d6310297090da0082a32193951b5b46.zip
opensim-SC_OLD-119aeeed7d6310297090da0082a32193951b5b46.tar.gz
opensim-SC_OLD-119aeeed7d6310297090da0082a32193951b5b46.tar.bz2
opensim-SC_OLD-119aeeed7d6310297090da0082a32193951b5b46.tar.xz
Another cleanup: Region_Status renamed to RegionStatus, and a usage comment added
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IScene.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs4
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 572d045..c9cdadb 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
59 public interface IScene 59 public interface IScene
60 { 60 {
61 RegionInfo RegionInfo { get; } 61 RegionInfo RegionInfo { get; }
62 RegionStatus Region_Status { get; set; } 62 RegionStatus RegionStatus { get; set; }
63 63
64 ClientManager ClientManager { get; } 64 ClientManager ClientManager { get; }
65 event restart OnRestart; 65 event restart OnRestart;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 26a8959..e796cff 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -403,7 +403,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
403 protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) 403 protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
404 { 404 {
405 //Slave regions don't accept new clients 405 //Slave regions don't accept new clients
406 if (m_localScene.Region_Status != RegionStatus.SlaveScene) 406 if (m_localScene.RegionStatus != RegionStatus.SlaveScene)
407 { 407 {
408 AuthenticateResponse sessionInfo; 408 AuthenticateResponse sessionInfo;
409 bool isNewCircuit = false; 409 bool isNewCircuit = false;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2714836..b650b79 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -886,7 +886,7 @@ namespace OpenSim.Region.Framework.Scenes
886 if (m_frame % m_update_backup == 0) 886 if (m_frame % m_update_backup == 0)
887 CleanTempObjects(); 887 CleanTempObjects();
888 888
889 if (Region_Status != RegionStatus.SlaveScene) 889 if (RegionStatus != RegionStatus.SlaveScene)
890 { 890 {
891 if (m_frame % m_update_events == 0) 891 if (m_frame % m_update_events == 0)
892 UpdateEvents(); 892 UpdateEvents();
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 89b5d77..4f5f523 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -127,9 +127,9 @@ namespace OpenSim.Region.Framework.Scenes
127 127
128 protected string m_datastore; 128 protected string m_datastore;
129 129
130 /* Used by the loadbalancer plugin on GForge */
130 protected RegionStatus m_regStatus; 131 protected RegionStatus m_regStatus;
131 132 public RegionStatus RegionStatus
132 public RegionStatus Region_Status
133 { 133 {
134 get { return m_regStatus; } 134 get { return m_regStatus; }
135 set { m_regStatus = value; } 135 set { m_regStatus = value; }