aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs15
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 4f52ad6..e915fb8 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -28,11 +28,14 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
31using System.Threading; 33using System.Threading;
32using libsecondlife; 34using libsecondlife;
35using log4net;
33using Nini.Config; 36using Nini.Config;
34using Nwc.XmlRpc; 37using Nwc.XmlRpc;
35using OpenSim.Framework.Console; 38using OpenSim.Framework;
36using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
37using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
@@ -74,7 +77,7 @@ namespace OpenSim.Region.Environment.Modules
74{ 77{
75 public class XMLRPCModule : IRegionModule, IXMLRPC 78 public class XMLRPCModule : IRegionModule, IXMLRPC
76 { 79 {
77 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 80 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
78 81
79 private object XMLRPCListLock = new object(); 82 private object XMLRPCListLock = new object();
80 private string m_name = "XMLRPCModule"; 83 private string m_name = "XMLRPCModule";
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Modules
208 } 211 }
209 } 212 }
210 213
211 System.Collections.IEnumerator tmpEnumerator = tmp.GetEnumerator(); 214 IEnumerator tmpEnumerator = tmp.GetEnumerator();
212 while ( tmpEnumerator.MoveNext() ) 215 while ( tmpEnumerator.MoveNext() )
213 m_openChannels.Remove((LLUUID)tmpEnumerator.Current); 216 m_openChannels.Remove((LLUUID)tmpEnumerator.Current);
214 } 217 }
@@ -559,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules
559 private Thread httpThread; 562 private Thread httpThread;
560 public LLUUID m_itemID; 563 public LLUUID m_itemID;
561 public uint m_localID; 564 public uint m_localID;
562 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 565 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
563 566
564 public SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata) 567 public SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata)
565 { 568 {
@@ -583,7 +586,7 @@ namespace OpenSim.Region.Environment.Modules
583 httpThread.IsBackground = true; 586 httpThread.IsBackground = true;
584 finished = false; 587 finished = false;
585 httpThread.Start(); 588 httpThread.Start();
586 OpenSim.Framework.ThreadTracker.Add(httpThread); 589 ThreadTracker.Add(httpThread);
587 590
588 return reqID; 591 return reqID;
589 592
@@ -648,7 +651,7 @@ namespace OpenSim.Region.Environment.Modules
648 } 651 }
649 } 652 }
650 } 653 }
651 catch (System.Net.WebException we) 654 catch (WebException we)
652 { 655 {
653 sdata = we.Message; 656 sdata = we.Message;
654 m_log.Warn("[SendRemoteDataRequest]: Request failed"); 657 m_log.Warn("[SendRemoteDataRequest]: Request failed");