OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another cleanup: Region_Status renamed to RegionStatus, and a usage comment added

0.6.5-rc1
Johan Berntsson 2009-04-15 04:15:47 +00:00
parent 068127bf57
commit 119aeeed7d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IScene.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Framework
public interface IScene public interface IScene
{ {
RegionInfo RegionInfo { get; } RegionInfo RegionInfo { get; }
RegionStatus Region_Status { get; set; } RegionStatus RegionStatus { get; set; }
ClientManager ClientManager { get; } ClientManager ClientManager { get; }
event restart OnRestart; event restart OnRestart;

2
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -403,7 +403,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
{ {
//Slave regions don't accept new clients //Slave regions don't accept new clients
if (m_localScene.Region_Status != RegionStatus.SlaveScene) if (m_localScene.RegionStatus != RegionStatus.SlaveScene)
{ {
AuthenticateResponse sessionInfo; AuthenticateResponse sessionInfo;
bool isNewCircuit = false; bool isNewCircuit = false;

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -886,7 +886,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_frame % m_update_backup == 0) if (m_frame % m_update_backup == 0)
CleanTempObjects(); CleanTempObjects();
if (Region_Status != RegionStatus.SlaveScene) if (RegionStatus != RegionStatus.SlaveScene)
{ {
if (m_frame % m_update_events == 0) if (m_frame % m_update_events == 0)
UpdateEvents(); UpdateEvents();

4
OpenSim/Region/Framework/Scenes/SceneBase.cs
View File

@ -127,9 +127,9 @@ namespace OpenSim.Region.Framework.Scenes
protected string m_datastore; protected string m_datastore;
/* Used by the loadbalancer plugin on GForge */
protected RegionStatus m_regStatus; protected RegionStatus m_regStatus;
public RegionStatus RegionStatus
public RegionStatus Region_Status
{ {
get { return m_regStatus; } get { return m_regStatus; }
set { m_regStatus = value; } set { m_regStatus = value; }