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/Framework/Communications | |
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 '')
30 files changed, 71 insertions, 88 deletions
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs index 133ba0d..caf96ff 100644 --- a/OpenSim/Framework/Communications/CAPSService.cs +++ b/OpenSim/Framework/Communications/CAPSService.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using OpenSim.Framework.Servers; | 29 | using OpenSim.Framework.Servers; |
29 | 30 | ||
30 | namespace OpenSim.Framework.Communications | 31 | namespace OpenSim.Framework.Communications |
@@ -47,7 +48,7 @@ namespace OpenSim.Framework.Communications | |||
47 | public string CapsRequest(string request, string path, string param) | 48 | public string CapsRequest(string request, string path, string param) |
48 | { | 49 | { |
49 | System.Console.WriteLine("new caps request " + request + " from path " + path); | 50 | System.Console.WriteLine("new caps request " + request + " from path " + path); |
50 | return System.String.Empty; | 51 | return String.Empty; |
51 | } | 52 | } |
52 | } | 53 | } |
53 | } | 54 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 4d37e74..c81ea35 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -27,11 +27,11 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using System.Threading; | 31 | using System.Threading; |
31 | using libsecondlife; | 32 | using libsecondlife; |
32 | using libsecondlife.Packets; | 33 | using libsecondlife.Packets; |
33 | 34 | using log4net; | |
34 | using OpenSim.Framework.Console; | ||
35 | using OpenSim.Framework.Statistics; | 35 | using OpenSim.Framework.Statistics; |
36 | 36 | ||
37 | namespace OpenSim.Framework.Communications.Cache | 37 | namespace OpenSim.Framework.Communications.Cache |
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
52 | /// </summary> | 52 | /// </summary> |
53 | public class AssetCache : IAssetReceiver | 53 | public class AssetCache : IAssetReceiver |
54 | { | 54 | { |
55 | private static readonly log4net.ILog m_log | 55 | private static readonly ILog m_log |
56 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 56 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// The cache of assets. This does not include textures. | 59 | /// The cache of assets. This does not include textures. |
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
170 | m_assetCacheThread.Name = "AssetCacheThread"; | 170 | m_assetCacheThread.Name = "AssetCacheThread"; |
171 | m_assetCacheThread.IsBackground = true; | 171 | m_assetCacheThread.IsBackground = true; |
172 | m_assetCacheThread.Start(); | 172 | m_assetCacheThread.Start(); |
173 | OpenSim.Framework.ThreadTracker.Add(m_assetCacheThread); | 173 | ThreadTracker.Add(m_assetCacheThread); |
174 | } | 174 | } |
175 | 175 | ||
176 | /// <summary> | 176 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index 3ce28c2..891fa6d 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs | |||
@@ -25,16 +25,17 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | using System.IO; | 27 | using System.IO; |
28 | using System.Reflection; | ||
28 | using Db4objects.Db4o; | 29 | using Db4objects.Db4o; |
29 | using Db4objects.Db4o.Query; | 30 | using Db4objects.Db4o.Query; |
30 | using libsecondlife; | 31 | using libsecondlife; |
31 | using OpenSim.Framework.Console; | 32 | using log4net; |
32 | 33 | ||
33 | namespace OpenSim.Framework.Communications.Cache | 34 | namespace OpenSim.Framework.Communications.Cache |
34 | { | 35 | { |
35 | public class LocalAssetServer : AssetServerBase | 36 | public class LocalAssetServer : AssetServerBase |
36 | { | 37 | { |
37 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
38 | 39 | ||
39 | private IObjectContainer db; | 40 | private IObjectContainer db; |
40 | 41 | ||
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 261b697..1a7f872 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs | |||
@@ -26,18 +26,18 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Reflection; |
30 | using System.Threading; | 30 | using System.Threading; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using OpenSim.Framework.Console; | 32 | using log4net; |
33 | using OpenSim.Framework.AssetLoader.Filesystem; | 33 | using OpenSim.Framework.AssetLoader.Filesystem; |
34 | 34 | ||
35 | namespace OpenSim.Framework.Communications.Cache | 35 | namespace OpenSim.Framework.Communications.Cache |
36 | { | 36 | { |
37 | public abstract class AssetServerBase : IAssetServer | 37 | public abstract class AssetServerBase : IAssetServer |
38 | { | 38 | { |
39 | private static readonly log4net.ILog m_log | 39 | private static readonly ILog m_log |
40 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 40 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | protected IAssetReceiver m_receiver; | 42 | protected IAssetReceiver m_receiver; |
43 | protected BlockingQueue<AssetRequest> m_assetRequests; | 43 | protected BlockingQueue<AssetRequest> m_assetRequests; |
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
100 | m_localAssetServerThread.Name = "LocalAssetServerThread"; | 100 | m_localAssetServerThread.Name = "LocalAssetServerThread"; |
101 | m_localAssetServerThread.IsBackground = true; | 101 | m_localAssetServerThread.IsBackground = true; |
102 | m_localAssetServerThread.Start(); | 102 | m_localAssetServerThread.Start(); |
103 | OpenSim.Framework.ThreadTracker.Add(m_localAssetServerThread); | 103 | ThreadTracker.Add(m_localAssetServerThread); |
104 | } | 104 | } |
105 | 105 | ||
106 | private void RunRequests() | 106 | private void RunRequests() |
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index ec5717e..a245af1 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -27,8 +27,9 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | using System.Reflection; | |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
32 | 33 | ||
33 | namespace OpenSim.Framework.Communications.Cache | 34 | namespace OpenSim.Framework.Communications.Cache |
34 | { | 35 | { |
@@ -37,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
37 | /// </summary> | 38 | /// </summary> |
38 | public class CachedUserInfo | 39 | public class CachedUserInfo |
39 | { | 40 | { |
40 | private static readonly log4net.ILog m_log | 41 | private static readonly ILog m_log |
41 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 42 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 43 | ||
43 | /// <summary> | 44 | /// <summary> |
44 | /// The comms manager holds references to services (user, grid, inventory, etc.) | 45 | /// The comms manager holds references to services (user, grid, inventory, etc.) |
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 3e703d2..d5b7fea 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |||
@@ -27,15 +27,16 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | ||
30 | using System.Xml.Serialization; | 31 | using System.Xml.Serialization; |
31 | using OpenSim.Framework.Console; | 32 | using log4net; |
32 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
33 | 34 | ||
34 | namespace OpenSim.Framework.Communications.Cache | 35 | namespace OpenSim.Framework.Communications.Cache |
35 | { | 36 | { |
36 | public class GridAssetClient : AssetServerBase | 37 | public class GridAssetClient : AssetServerBase |
37 | { | 38 | { |
38 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | 40 | ||
40 | private string _assetServerUrl; | 41 | private string _assetServerUrl; |
41 | 42 | ||
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 03036d0..a39738d 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -28,10 +28,11 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | ||
31 | using System.Xml; | 32 | using System.Xml; |
32 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
33 | using Nini.Config; | 35 | using Nini.Config; |
34 | using OpenSim.Framework.Console; | ||
35 | 36 | ||
36 | namespace OpenSim.Framework.Communications.Cache | 37 | namespace OpenSim.Framework.Communications.Cache |
37 | { | 38 | { |
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
41 | /// </summary> | 42 | /// </summary> |
42 | public class LibraryRootFolder : InventoryFolderImpl | 43 | public class LibraryRootFolder : InventoryFolderImpl |
43 | { | 44 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 46 | ||
46 | private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); | 47 | private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); |
47 | 48 | ||
@@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
153 | { | 154 | { |
154 | string foldersPath | 155 | string foldersPath |
155 | = Path.Combine( | 156 | = Path.Combine( |
156 | Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty)); | 157 | Util.inventoryDir(), config.GetString("foldersFile", String.Empty)); |
157 | 158 | ||
158 | LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); | 159 | LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); |
159 | 160 | ||
160 | string itemsPath | 161 | string itemsPath |
161 | = Path.Combine( | 162 | = Path.Combine( |
162 | Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty)); | 163 | Util.inventoryDir(), config.GetString("itemsFile", String.Empty)); |
163 | 164 | ||
164 | LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); | 165 | LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); |
165 | } | 166 | } |
@@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
209 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); | 210 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); |
210 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); | 211 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); |
211 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); | 212 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); |
212 | item.Description = config.GetString("description", System.String.Empty); | 213 | item.Description = config.GetString("description", String.Empty); |
213 | item.Name = config.GetString("name", System.String.Empty); | 214 | item.Name = config.GetString("name", String.Empty); |
214 | item.AssetType = config.GetInt("assetType", 0); | 215 | item.AssetType = config.GetInt("assetType", 0); |
215 | item.InvType = config.GetInt("inventoryType", 0); | 216 | item.InvType = config.GetInt("inventoryType", 0); |
216 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); | 217 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); |
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 4f1a304..1afec70 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | |||
@@ -27,13 +27,13 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using OpenSim.Framework.Console; | 30 | using log4net; |
31 | 31 | ||
32 | namespace OpenSim.Framework.Communications.Cache | 32 | namespace OpenSim.Framework.Communications.Cache |
33 | { | 33 | { |
34 | public class SQLAssetServer : AssetServerBase | 34 | public class SQLAssetServer : AssetServerBase |
35 | { | 35 | { |
36 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 36 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
37 | 37 | ||
38 | public SQLAssetServer(string pluginName) | 38 | public SQLAssetServer(string pluginName) |
39 | { | 39 | { |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 9813756..bf8ff40 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -25,13 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | ||
30 | using System.Threading; | 30 | using System.Threading; |
31 | |||
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | 32 | using log4net; | |
34 | using OpenSim.Framework.Console; | ||
35 | 33 | ||
36 | namespace OpenSim.Framework.Communications.Cache | 34 | namespace OpenSim.Framework.Communications.Cache |
37 | { | 35 | { |
@@ -40,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
40 | /// </summary> | 38 | /// </summary> |
41 | public class UserProfileCacheService | 39 | public class UserProfileCacheService |
42 | { | 40 | { |
43 | private static readonly log4net.ILog m_log | 41 | private static readonly ILog m_log |
44 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 42 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 43 | ||
46 | /// <summary> | 44 | /// <summary> |
47 | /// The comms manager holds references to services (user, grid, inventory, etc.) | 45 | /// The comms manager holds references to services (user, grid, inventory, etc.) |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 2eff9c2..c07744c 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -29,12 +29,11 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | 32 | using System.Reflection; | |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | 34 | using log4net; | |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
37 | using OpenSim.Framework.Console; | ||
38 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
39 | 38 | ||
40 | namespace OpenSim.Region.Capabilities | 39 | namespace OpenSim.Region.Capabilities |
@@ -66,8 +65,8 @@ namespace OpenSim.Region.Capabilities | |||
66 | 65 | ||
67 | public class Caps | 66 | public class Caps |
68 | { | 67 | { |
69 | private static readonly log4net.ILog m_log = | 68 | private static readonly ILog m_log = |
70 | log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 69 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
71 | 70 | ||
72 | private string m_httpListenerHostName; | 71 | private string m_httpListenerHostName; |
73 | private uint m_httpListenPort; | 72 | private uint m_httpListenPort; |
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs index 6992bd1..3e3ae16 100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs | |||
@@ -25,14 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections; | 28 | using System.Collections; |
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.IO; | ||
32 | using libsecondlife; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Communications.Cache; | ||
35 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Framework.Servers; | 30 | using OpenSim.Framework.Servers; |
37 | 31 | ||
38 | namespace OpenSim.Region.Capabilities | 32 | namespace OpenSim.Region.Capabilities |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs index 876b8d3..1393523 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs | |||
@@ -25,8 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife; | ||
29 | using System; | 28 | using System; |
29 | using libsecondlife; | ||
30 | 30 | ||
31 | namespace OpenSim.Region.Capabilities | 31 | namespace OpenSim.Region.Capabilities |
32 | { | 32 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs index fb64c75..e71a73e 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using libsecondlife; | 29 | using libsecondlife; |
29 | 30 | ||
30 | namespace OpenSim.Region.Capabilities | 31 | namespace OpenSim.Region.Capabilities |
@@ -32,11 +33,11 @@ namespace OpenSim.Region.Capabilities | |||
32 | [LLSDMap] | 33 | [LLSDMap] |
33 | public class LLSDAssetUploadRequest | 34 | public class LLSDAssetUploadRequest |
34 | { | 35 | { |
35 | public string asset_type = System.String.Empty; | 36 | public string asset_type = String.Empty; |
36 | public string description = System.String.Empty; | 37 | public string description = String.Empty; |
37 | public LLUUID folder_id = LLUUID.Zero; | 38 | public LLUUID folder_id = LLUUID.Zero; |
38 | public string inventory_type = System.String.Empty; | 39 | public string inventory_type = String.Empty; |
39 | public string name = System.String.Empty; | 40 | public string name = String.Empty; |
40 | 41 | ||
41 | public LLSDAssetUploadRequest() | 42 | public LLSDAssetUploadRequest() |
42 | { | 43 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs index fb721f0..bb293ba 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs | |||
@@ -25,13 +25,15 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | |||
28 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Region.Capabilities |
29 | { | 31 | { |
30 | [LLSDMap] | 32 | [LLSDMap] |
31 | public class LLSDAssetUploadResponse | 33 | public class LLSDAssetUploadResponse |
32 | { | 34 | { |
33 | public string uploader = System.String.Empty; | 35 | public string uploader = String.Empty; |
34 | public string state = System.String.Empty; | 36 | public string state = String.Empty; |
35 | 37 | ||
36 | public LLSDAssetUploadResponse() | 38 | public LLSDAssetUploadResponse() |
37 | { | 39 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index 36a2cbf..d402579 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -25,9 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | 28 | using libsecondlife; |
32 | 29 | ||
33 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Region.Capabilities |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs index 4fb0544..4439346 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using libsecondlife; | ||
31 | 30 | ||
32 | namespace OpenSim.Region.Capabilities | 31 | namespace OpenSim.Region.Capabilities |
33 | { | 32 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs index 8a18213..941e70e 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs | |||
@@ -26,8 +26,6 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using libsecondlife; | ||
30 | |||
31 | namespace OpenSim.Region.Capabilities | 29 | namespace OpenSim.Region.Capabilities |
32 | { | 30 | { |
33 | [LLSDMap] | 31 | [LLSDMap] |
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 192c8e3..ee0d164 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -27,7 +27,9 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
31 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
32 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
33 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
@@ -36,7 +38,7 @@ namespace OpenSim.Framework.Communications | |||
36 | { | 38 | { |
37 | public class CommunicationsManager | 39 | public class CommunicationsManager |
38 | { | 40 | { |
39 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 42 | ||
41 | protected IUserService m_userService; | 43 | protected IUserService m_userService; |
42 | 44 | ||
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index 5e7f855..90bda01 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs | |||
@@ -26,9 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | |||
30 | using libsecondlife; | 29 | using libsecondlife; |
31 | |||
32 | using OpenSim.Framework.Communications.Cache; | 30 | using OpenSim.Framework.Communications.Cache; |
33 | 31 | ||
34 | namespace OpenSim.Framework.Communications | 32 | namespace OpenSim.Framework.Communications |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index d4e7539..f614e7d 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -29,14 +29,14 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using OpenSim.Framework.Console; | 32 | using log4net; |
33 | 33 | ||
34 | namespace OpenSim.Framework.Communications | 34 | namespace OpenSim.Framework.Communications |
35 | { | 35 | { |
36 | public abstract class InventoryServiceBase : IInventoryServices | 36 | public abstract class InventoryServiceBase : IInventoryServices |
37 | { | 37 | { |
38 | private static readonly log4net.ILog m_log | 38 | private static readonly ILog m_log |
39 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 39 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>(); | 41 | protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>(); |
42 | 42 | ||
diff --git a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs index ded9ffc..6ec21d9 100644 --- a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs | |||
@@ -25,8 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | |||
30 | namespace OpenSim.Framework.Communications.Limit | 28 | namespace OpenSim.Framework.Communications.Limit |
31 | { | 29 | { |
32 | /// <summary> | 30 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs index 43b77a7..72d0586 100644 --- a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs | |||
@@ -25,8 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | |||
30 | namespace OpenSim.Framework.Communications.Limit | 28 | namespace OpenSim.Framework.Communications.Limit |
31 | { | 29 | { |
32 | /// <summary> | 30 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs index 85ff2bd..dfa05fa 100644 --- a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs | |||
@@ -25,7 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | 29 | ||
31 | namespace OpenSim.Framework.Communications.Limit | 30 | namespace OpenSim.Framework.Communications.Limit |
diff --git a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs index b2b4f14..34b01ff 100644 --- a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Communications.Limit | |||
104 | { | 104 | { |
105 | if (!IsMonitoringRequests(id)) | 105 | if (!IsMonitoringRequests(id)) |
106 | { | 106 | { |
107 | requests.Add(id, new Request(System.DateTime.Now)); | 107 | requests.Add(id, new Request(DateTime.Now)); |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 1b88d10..a379253 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -28,10 +28,11 @@ | |||
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.Reflection; | ||
31 | using libsecondlife; | 32 | using libsecondlife; |
32 | using libsecondlife.StructuredData; | 33 | using libsecondlife.StructuredData; |
34 | using log4net; | ||
33 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
34 | using OpenSim.Framework.Console; | ||
35 | 36 | ||
36 | namespace OpenSim.Framework.UserManagement | 37 | namespace OpenSim.Framework.UserManagement |
37 | { | 38 | { |
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.UserManagement | |||
41 | /// </summary> | 42 | /// </summary> |
42 | public class LoginResponse | 43 | public class LoginResponse |
43 | { | 44 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 46 | ||
46 | private Hashtable loginFlagsHash; | 47 | private Hashtable loginFlagsHash; |
47 | private Hashtable globalTexturesHash; | 48 | private Hashtable globalTexturesHash; |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index ce8aa23..d656559 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -29,21 +29,22 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | ||
32 | using System.Text.RegularExpressions; | 33 | using System.Text.RegularExpressions; |
33 | using System.Threading; | 34 | using System.Threading; |
35 | using System.Web; | ||
34 | using libsecondlife; | 36 | using libsecondlife; |
35 | using libsecondlife.StructuredData; | 37 | using libsecondlife.StructuredData; |
38 | using log4net; | ||
36 | using Nwc.XmlRpc; | 39 | using Nwc.XmlRpc; |
37 | |||
38 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Framework.Console; | ||
40 | using OpenSim.Framework.Statistics; | 41 | using OpenSim.Framework.Statistics; |
41 | 42 | ||
42 | namespace OpenSim.Framework.UserManagement | 43 | namespace OpenSim.Framework.UserManagement |
43 | { | 44 | { |
44 | public abstract class LoginService | 45 | public abstract class LoginService |
45 | { | 46 | { |
46 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 48 | ||
48 | protected string m_welcomeMessage = "Welcome to OpenSim"; | 49 | protected string m_welcomeMessage = "Welcome to OpenSim"; |
49 | protected UserManagerBase m_userManager = null; | 50 | protected UserManagerBase m_userManager = null; |
@@ -159,7 +160,7 @@ namespace OpenSim.Framework.UserManagement | |||
159 | { | 160 | { |
160 | webloginkey = new LLUUID((string)requestData["web_login_key"]); | 161 | webloginkey = new LLUUID((string)requestData["web_login_key"]); |
161 | } | 162 | } |
162 | catch (System.Exception e) | 163 | catch (Exception e) |
163 | { | 164 | { |
164 | m_log.InfoFormat( | 165 | m_log.InfoFormat( |
165 | "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", | 166 | "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", |
@@ -514,7 +515,7 @@ namespace OpenSim.Framework.UserManagement | |||
514 | statuscode = 301; | 515 | statuscode = 301; |
515 | 516 | ||
516 | string redirectURL = "about:blank?redirect-http-hack=" + | 517 | string redirectURL = "about:blank?redirect-http-hack=" + |
517 | System.Web.HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + | 518 | HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + |
518 | lastname + | 519 | lastname + |
519 | "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); | 520 | "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); |
520 | //m_log.Info("[WEB]: R:" + redirectURL); | 521 | //m_log.Info("[WEB]: R:" + redirectURL); |
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs index 1178fed..5463134 100644 --- a/OpenSim/Framework/Communications/RestClient/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs | |||
@@ -29,10 +29,11 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Reflection; | ||
32 | using System.Text; | 33 | using System.Text; |
33 | using System.Threading; | 34 | using System.Threading; |
34 | using System.Web; | 35 | using System.Web; |
35 | using OpenSim.Framework.Console; | 36 | using log4net; |
36 | 37 | ||
37 | namespace OpenSim.Framework.Communications | 38 | namespace OpenSim.Framework.Communications |
38 | { | 39 | { |
@@ -55,7 +56,7 @@ namespace OpenSim.Framework.Communications | |||
55 | /// </remarks> | 56 | /// </remarks> |
56 | public class RestClient | 57 | public class RestClient |
57 | { | 58 | { |
58 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 59 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
59 | 60 | ||
60 | private string realuri; | 61 | private string realuri; |
61 | 62 | ||
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index c86992a..0f7dc44 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -32,8 +32,8 @@ using System.Reflection; | |||
32 | using System.Security.Cryptography; | 32 | using System.Security.Cryptography; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using libsecondlife.StructuredData; | 34 | using libsecondlife.StructuredData; |
35 | using log4net; | ||
35 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
36 | using OpenSim.Framework.Console; | ||
37 | using OpenSim.Framework.Statistics; | 37 | using OpenSim.Framework.Statistics; |
38 | 38 | ||
39 | namespace OpenSim.Framework.UserManagement | 39 | namespace OpenSim.Framework.UserManagement |
@@ -43,8 +43,8 @@ namespace OpenSim.Framework.UserManagement | |||
43 | /// </summary> | 43 | /// </summary> |
44 | public abstract class UserManagerBase : IUserService | 44 | public abstract class UserManagerBase : IUserService |
45 | { | 45 | { |
46 | private static readonly log4net.ILog m_log | 46 | private static readonly ILog m_log |
47 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 47 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | public UserConfig _config; | 49 | public UserConfig _config; |
50 | private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); | 50 | private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); |
diff --git a/OpenSim/Framework/Communications/XMPP/Stanza.cs b/OpenSim/Framework/Communications/XMPP/Stanza.cs index 5675a47..3930bac 100644 --- a/OpenSim/Framework/Communications/XMPP/Stanza.cs +++ b/OpenSim/Framework/Communications/XMPP/Stanza.cs | |||
@@ -26,8 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Xml; | 29 | using System.Xml; |
32 | 30 | ||
33 | namespace OpenSim.Framework.Communications.XMPP | 31 | namespace OpenSim.Framework.Communications.XMPP |
diff --git a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs index e41df26..26a78b2 100644 --- a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs +++ b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs | |||
@@ -25,12 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Xml; | ||
32 | using OpenSim.Framework; | ||
33 | |||
34 | namespace OpenSim.Framework.Communications.XMPP | 28 | namespace OpenSim.Framework.Communications.XMPP |
35 | { | 29 | { |
36 | public class XMPPParser | 30 | public class XMPPParser |