diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 |
2 files changed, 2 insertions, 5 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) |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 2fe96a2..c49a1f6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
221 | [Test] | 221 | [Test] |
222 | public void TestMergeOarV0p2() | 222 | public void TestMergeOarV0p2() |
223 | { | 223 | { |
224 | XmlConfigurator.Configure(); | 224 | //XmlConfigurator.Configure(); |
225 | 225 | ||
226 | MemoryStream archiveWriteStream = new MemoryStream(); | 226 | MemoryStream archiveWriteStream = new MemoryStream(); |
227 | 227 | ||