diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index ea356ac..f69fb5e 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers | |||
50 | private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); | 50 | private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); |
51 | 51 | ||
52 | private volatile int NotSocketErrors = 0; | 52 | private volatile int NotSocketErrors = 0; |
53 | private volatile bool HTTPDRunning = false; | 53 | public volatile bool HTTPDRunning = false; |
54 | 54 | ||
55 | protected Thread m_workerThread; | 55 | protected Thread m_workerThread; |
56 | protected HttpListener m_httpListener; | 56 | protected HttpListener m_httpListener; |
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs index 3e8599b..4daaab4 100644 --- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs | |||
@@ -642,13 +642,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST | |||
642 | protected virtual void DoDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle) | 642 | protected virtual void DoDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle) |
643 | { | 643 | { |
644 | //Console.WriteLine(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle); | 644 | //Console.WriteLine(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle); |
645 | bool result = true; | 645 | |
646 | if (action.Equals("release")) | 646 | if (action.Equals("release")) |
647 | { | 647 | m_localBackend.SendReleaseAgent(regionHandle, id, ""); |
648 | result = m_localBackend.SendReleaseAgent(regionHandle, id, ""); | ||
649 | } | ||
650 | else | 648 | else |
651 | result = m_localBackend.SendCloseAgent(regionHandle, id); | 649 | m_localBackend.SendCloseAgent(regionHandle, id); |
652 | 650 | ||
653 | responsedata["int_response_code"] = 200; | 651 | responsedata["int_response_code"] = 200; |
654 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); | 652 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); |