diff options
author | Justin Clarke Casey | 2009-02-13 20:12:11 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-13 20:12:11 +0000 |
commit | b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8 (patch) | |
tree | 897a3911b2ea50bc97f1bfa60d31c0608f976f35 /OpenSim/Region/CoreModules/Communications | |
parent | * refactor: move alert commands from Scene to DialogModule (diff) | |
download | opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.zip opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.gz opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.bz2 opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.xz |
* Change static field "initialized" in RestInterregionComms to an instance field
* This was the cause of teleport tests interfering with each other
Diffstat (limited to 'OpenSim/Region/CoreModules/Communications')
-rw-r--r-- | OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs index f533553..fcb3f5b 100644 --- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
45 | { | 45 | { |
46 | public class RESTInterregionComms : IRegionModule, IInterregionCommsOut | 46 | public class RESTInterregionComms : IRegionModule, IInterregionCommsOut |
47 | { | 47 | { |
48 | private static bool initialized = false; | 48 | private bool initialized = false; |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | protected bool m_enabled = false; | 51 | protected bool m_enabled = false; |
@@ -78,7 +78,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
78 | return; | 78 | return; |
79 | 79 | ||
80 | InitEach(scene); | 80 | InitEach(scene); |
81 | |||
82 | } | 81 | } |
83 | 82 | ||
84 | public virtual void PostInitialise() | 83 | public virtual void PostInitialise() |
@@ -162,7 +161,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
162 | //else | 161 | //else |
163 | // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); | 162 | // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); |
164 | return false; | 163 | return false; |
165 | |||
166 | } | 164 | } |
167 | 165 | ||
168 | public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData) | 166 | public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData) |
@@ -180,7 +178,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
180 | //else | 178 | //else |
181 | // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); | 179 | // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); |
182 | return false; | 180 | return false; |
183 | |||
184 | } | 181 | } |
185 | 182 | ||
186 | public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) | 183 | public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) |