diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Modules/XMLRPCModule.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/Environment/Modules/XMLRPCModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/XMLRPCModule.cs | 15 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | ||
32 | using System.Reflection; | ||
31 | using System.Threading; | 33 | using System.Threading; |
32 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | ||
33 | using Nini.Config; | 36 | using Nini.Config; |
34 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
35 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Region.Environment.Interfaces; | 40 | using OpenSim.Region.Environment.Interfaces; |
38 | using OpenSim.Region.Environment.Scenes; | 41 | using 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"); |