From 119aeeed7d6310297090da0082a32193951b5b46 Mon Sep 17 00:00:00 2001 From: Johan Berntsson Date: Wed, 15 Apr 2009 04:15:47 +0000 Subject: [PATCH] Another cleanup: Region_Status renamed to RegionStatus, and a usage comment added --- OpenSim/Framework/IScene.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneBase.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 572d045e2c..c9cdadbd5c 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs @@ -59,7 +59,7 @@ namespace OpenSim.Framework public interface IScene { RegionInfo RegionInfo { get; } - RegionStatus Region_Status { get; set; } + RegionStatus RegionStatus { get; set; } ClientManager ClientManager { get; } event restart OnRestart; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 26a8959129..e796cffb0a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -403,7 +403,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) { //Slave regions don't accept new clients - if (m_localScene.Region_Status != RegionStatus.SlaveScene) + if (m_localScene.RegionStatus != RegionStatus.SlaveScene) { AuthenticateResponse sessionInfo; bool isNewCircuit = false; diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2714836691..b650b795f0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -886,7 +886,7 @@ namespace OpenSim.Region.Framework.Scenes if (m_frame % m_update_backup == 0) CleanTempObjects(); - if (Region_Status != RegionStatus.SlaveScene) + if (RegionStatus != RegionStatus.SlaveScene) { if (m_frame % m_update_events == 0) UpdateEvents(); diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 89b5d77d95..4f5f523965 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -127,9 +127,9 @@ namespace OpenSim.Region.Framework.Scenes protected string m_datastore; + /* Used by the loadbalancer plugin on GForge */ protected RegionStatus m_regStatus; - - public RegionStatus Region_Status + public RegionStatus RegionStatus { get { return m_regStatus; } set { m_regStatus = value; }