Remove vestigal RegionStatus.SlaveScene.
This appears to be code clutter since the code that uses this has long gone.remove-scene-viewer
parent
56dbab35e1
commit
37ae6451f9
|
@ -33,15 +33,12 @@ namespace OpenSim.Framework
|
||||||
{
|
{
|
||||||
public delegate void restart(RegionInfo thisRegion);
|
public delegate void restart(RegionInfo thisRegion);
|
||||||
|
|
||||||
//public delegate void regionup (RegionInfo thisRegion);
|
|
||||||
|
|
||||||
public enum RegionStatus : int
|
public enum RegionStatus : int
|
||||||
{
|
{
|
||||||
Down = 0,
|
Down = 0,
|
||||||
Up = 1,
|
Up = 1,
|
||||||
Crashed = 2,
|
Crashed = 2,
|
||||||
Starting = 3,
|
Starting = 3,
|
||||||
SlaveScene = 4
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <value>
|
/// <value>
|
||||||
|
|
|
@ -929,8 +929,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
UUID sessionID = useCircuitCode.CircuitCode.SessionID;
|
UUID sessionID = useCircuitCode.CircuitCode.SessionID;
|
||||||
uint circuitCode = useCircuitCode.CircuitCode.Code;
|
uint circuitCode = useCircuitCode.CircuitCode.Code;
|
||||||
|
|
||||||
if (m_scene.RegionStatus != RegionStatus.SlaveScene)
|
|
||||||
{
|
|
||||||
AuthenticateResponse sessionInfo;
|
AuthenticateResponse sessionInfo;
|
||||||
if (IsClientAuthorized(useCircuitCode, out sessionInfo))
|
if (IsClientAuthorized(useCircuitCode, out sessionInfo))
|
||||||
{
|
{
|
||||||
|
@ -944,12 +942,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
useCircuitCode.CircuitCode.ID, useCircuitCode.CircuitCode.Code, remoteEndPoint);
|
useCircuitCode.CircuitCode.ID, useCircuitCode.CircuitCode.Code, remoteEndPoint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// Slave regions don't accept new clients
|
|
||||||
m_log.Debug("[LLUDPSERVER]: Slave region " + m_scene.RegionInfo.RegionName + " ignoring UseCircuitCode packet");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
|
protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1278,8 +1278,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
|
tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (RegionStatus != RegionStatus.SlaveScene)
|
|
||||||
{
|
|
||||||
if (Frame % m_update_events == 0)
|
if (Frame % m_update_events == 0)
|
||||||
{
|
{
|
||||||
int evMS = Util.EnvironmentTickCount();
|
int evMS = Util.EnvironmentTickCount();
|
||||||
|
@ -1326,7 +1324,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
StatsReporter.addOtherMS(otherMS);
|
StatsReporter.addOtherMS(otherMS);
|
||||||
StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
|
StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
|
||||||
StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
|
StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
|
||||||
}
|
|
||||||
|
|
||||||
if (LoginsDisabled && Frame == 20)
|
if (LoginsDisabled && Frame == 20)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue