aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentInventory.cs5
-rw-r--r--OpenSim/Framework/AssetConfig.cs1
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs8
-rw-r--r--OpenSim/Framework/AvatarPickerAvatar.cs3
-rw-r--r--OpenSim/Framework/AvatarWearable.cs6
-rw-r--r--OpenSim/Framework/ClientManager.cs8
-rw-r--r--OpenSim/Framework/Communications/CAPSService.cs3
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServer.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs7
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs13
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs10
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs3
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs1
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs4
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs6
-rw-r--r--OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs2
-rw-r--r--OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs2
-rw-r--r--OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs1
-rw-r--r--OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs5
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs11
-rw-r--r--OpenSim/Framework/Communications/RestClient/RestClient.cs5
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs6
-rw-r--r--OpenSim/Framework/Communications/XMPP/Stanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XMPPParser.cs6
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs8
-rw-r--r--OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs4
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs3
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs5
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs7
-rw-r--r--OpenSim/Framework/Constants.cs4
-rw-r--r--OpenSim/Framework/EstateSettings.cs5
-rw-r--r--OpenSim/Framework/FriendListItem.cs2
-rw-r--r--OpenSim/Framework/GridConfig.cs1
-rw-r--r--OpenSim/Framework/GridInstantMessage.cs1
-rw-r--r--OpenSim/Framework/IAssetServer.cs2
-rw-r--r--OpenSim/Framework/IInventoryData.cs2
-rw-r--r--OpenSim/Framework/InventoryCollection.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs12
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs3
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs3
-rw-r--r--OpenSim/Framework/JId.cs2
-rw-r--r--OpenSim/Framework/LandData.cs2
-rw-r--r--OpenSim/Framework/Login.cs3
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs5
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs2
-rw-r--r--OpenSim/Framework/PacketPool.cs15
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs3
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs12
-rw-r--r--OpenSim/Framework/RegionUpData.cs2
-rw-r--r--OpenSim/Framework/SerializableInventory.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs14
-rw-r--r--OpenSim/Framework/Servers/GenericHTTPMethod.cs1
-rw-r--r--OpenSim/Framework/Servers/MessageServerInfo.cs2
-rw-r--r--OpenSim/Framework/Statistics/AssetStatsReporter.cs1
-rw-r--r--OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs2
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsReporter.cs5
-rw-r--r--OpenSim/Framework/Statistics/UserStatsReporter.cs1
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs7
-rw-r--r--OpenSim/Framework/ThreadTracker.cs11
-rw-r--r--OpenSim/Framework/UserConfig.cs1
-rw-r--r--OpenSim/Framework/Util.cs16
75 files changed, 158 insertions, 208 deletions
diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index 916cdf8..ef3ad16 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.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
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using libsecondlife; 30using libsecondlife;
30using libsecondlife.Packets; 31using libsecondlife.Packets;
@@ -230,7 +231,7 @@ namespace OpenSim.Framework
230 public LLUUID CreatorID; 231 public LLUUID CreatorID;
231 public sbyte InvType; 232 public sbyte InvType;
232 public sbyte Type; 233 public sbyte Type;
233 public string Name = System.String.Empty; 234 public string Name = String.Empty;
234 public string Description; 235 public string Description;
235 236
236 public InventoryItem() 237 public InventoryItem()
@@ -241,7 +242,7 @@ namespace OpenSim.Framework
241 public string ExportString() 242 public string ExportString()
242 { 243 {
243 string typ = "notecard"; 244 string typ = "notecard";
244 string result = System.String.Empty; 245 string result = String.Empty;
245 result += "\tinv_object\t0\n\t{\n"; 246 result += "\tinv_object\t0\n\t{\n";
246 result += "\t\tobj_id\t%s\n"; 247 result += "\t\tobj_id\t%s\n";
247 result += "\t\tparent_id\t" + ItemID.ToString() + "\n"; 248 result += "\t\tparent_id\t" + ItemID.ToString() + "\n";
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 8a4ce92..6f43693 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Console;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 4afea42..0cc10c4 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -28,14 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using System.Xml; 32using System.Xml;
32
33using libsecondlife; 33using libsecondlife;
34using log4net;
34using Nini.Config; 35using Nini.Config;
35 36
36using OpenSim.Framework;
37using OpenSim.Framework.Console;
38
39/// <summary> 37/// <summary>
40/// Loads assets from the filesystem location. Not yet a plugin, though it should be. 38/// Loads assets from the filesystem location. Not yet a plugin, though it should be.
41/// </summary> 39/// </summary>
@@ -43,7 +41,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
43{ 41{
44 public class AssetLoaderFileSystem : IAssetLoader 42 public class AssetLoaderFileSystem : IAssetLoader
45 { 43 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
48 protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage) 46 protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage)
49 { 47 {
diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs
index 2a60a8e..26a5bb2 100644
--- a/OpenSim/Framework/AvatarPickerAvatar.cs
+++ b/OpenSim/Framework/AvatarPickerAvatar.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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index b800030..cd5f7f6 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -25,10 +25,10 @@
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
28using libsecondlife;
29using System; 28using System;
30using System.Runtime.Serialization; 29using System.Runtime.Serialization;
31using System.Security.Permissions; 30using System.Security.Permissions;
31using libsecondlife;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
34{ 34{
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
77 //System.Console.WriteLine("AvatarWearable Deserialize BGN"); 77 //System.Console.WriteLine("AvatarWearable Deserialize BGN");
78 if (info == null) 78 if (info == null)
79 { 79 {
80 throw new System.ArgumentNullException("info"); 80 throw new ArgumentNullException("info");
81 } 81 }
82 82
83 AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid))); 83 AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid)));
@@ -93,7 +93,7 @@ namespace OpenSim.Framework
93 { 93 {
94 if (info == null) 94 if (info == null)
95 { 95 {
96 throw new System.ArgumentNullException("info"); 96 throw new ArgumentNullException("info");
97 } 97 }
98 98
99 info.AddValue("AssetID", AssetID.UUID); 99 info.AddValue("AssetID", AssetID.UUID);
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 40c04c3..160d5b6 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -27,8 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
32 34
33namespace OpenSim.Framework 35namespace OpenSim.Framework
34{ 36{
@@ -36,7 +38,7 @@ namespace OpenSim.Framework
36 38
37 public class ClientManager 39 public class ClientManager
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 private Dictionary<uint, IClientAPI> m_clients; 43 private Dictionary<uint, IClientAPI> m_clients;
42 44
@@ -56,7 +58,7 @@ namespace OpenSim.Framework
56 { 58 {
57 whatToDo(LocalClients[i]); 59 whatToDo(LocalClients[i]);
58 } 60 }
59 catch (System.Exception e) 61 catch (Exception e)
60 { 62 {
61 m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString()); 63 m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString());
62 } 64 }
@@ -129,7 +131,7 @@ namespace OpenSim.Framework
129 client.Close(false); 131 client.Close(false);
130 } 132 }
131 } 133 }
132 catch (System.Exception e) 134 catch (Exception e)
133 { 135 {
134 m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e)); 136 m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e));
135 } 137 }
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
28using System;
28using OpenSim.Framework.Servers; 29using OpenSim.Framework.Servers;
29 30
30namespace OpenSim.Framework.Communications 31namespace 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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Threading; 31using System.Threading;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
33 34using log4net;
34using OpenSim.Framework.Console;
35using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace 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 */
27using System.IO; 27using System.IO;
28using System.Reflection;
28using Db4objects.Db4o; 29using Db4objects.Db4o;
29using Db4objects.Db4o.Query; 30using Db4objects.Db4o.Query;
30using libsecondlife; 31using libsecondlife;
31using OpenSim.Framework.Console; 32using log4net;
32 33
33namespace OpenSim.Framework.Communications.Cache 34namespace 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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Reflection;
30using System.Threading; 30using System.Threading;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Console; 32using log4net;
33using OpenSim.Framework.AssetLoader.Filesystem; 33using OpenSim.Framework.AssetLoader.Filesystem;
34 34
35namespace OpenSim.Framework.Communications.Cache 35namespace 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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32 33
33namespace OpenSim.Framework.Communications.Cache 34namespace 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
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using System.Xml.Serialization; 31using System.Xml.Serialization;
31using OpenSim.Framework.Console; 32using log4net;
32using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
33 34
34namespace OpenSim.Framework.Communications.Cache 35namespace 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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using System.Xml; 32using System.Xml;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Nini.Config; 35using Nini.Config;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Framework.Communications.Cache 37namespace 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
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenSim.Framework.Console; 30using log4net;
31 31
32namespace OpenSim.Framework.Communications.Cache 32namespace 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
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using System.Threading; 30using System.Threading;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework.Console;
35 33
36namespace OpenSim.Framework.Communications.Cache 34namespace 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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32 32using System.Reflection;
33using libsecondlife; 33using libsecondlife;
34 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
39 38
40namespace OpenSim.Region.Capabilities 39namespace 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
28using System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 30using OpenSim.Framework.Servers;
37 31
38namespace OpenSim.Region.Capabilities 32namespace 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
28using libsecondlife;
29using System; 28using System;
29using libsecondlife;
30 30
31namespace OpenSim.Region.Capabilities 31namespace 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
28using System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Region.Capabilities 31namespace 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
28using System;
29
28namespace OpenSim.Region.Capabilities 30namespace 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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Region.Capabilities 30namespace 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
29using System.Collections; 29using System.Collections;
30using libsecondlife;
31 30
32namespace OpenSim.Region.Capabilities 31namespace 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
29using libsecondlife;
30
31namespace OpenSim.Region.Capabilities 29namespace 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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
33using OpenSim.Framework.Servers; 35using 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
28using System.Collections.Generic; 28using System.Collections.Generic;
29
30using libsecondlife; 29using libsecondlife;
31
32using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
33 31
34namespace OpenSim.Framework.Communications 32namespace 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Console; 32using log4net;
33 33
34namespace OpenSim.Framework.Communications 34namespace 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
28using System;
29
30namespace OpenSim.Framework.Communications.Limit 28namespace 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
28using System;
29
30namespace OpenSim.Framework.Communications.Limit 28namespace 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
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30 29
31namespace OpenSim.Framework.Communications.Limit 30namespace 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 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.StructuredData; 33using libsecondlife.StructuredData;
34using log4net;
33using Nwc.XmlRpc; 35using Nwc.XmlRpc;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Framework.UserManagement 37namespace 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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using System.Threading; 34using System.Threading;
35using System.Web;
34using libsecondlife; 36using libsecondlife;
35using libsecondlife.StructuredData; 37using libsecondlife.StructuredData;
38using log4net;
36using Nwc.XmlRpc; 39using Nwc.XmlRpc;
37
38using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
39using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
41 42
42namespace OpenSim.Framework.UserManagement 43namespace 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
34using System.Web; 35using System.Web;
35using OpenSim.Framework.Console; 36using log4net;
36 37
37namespace OpenSim.Framework.Communications 38namespace 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;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using libsecondlife; 33using libsecondlife;
34using libsecondlife.StructuredData; 34using libsecondlife.StructuredData;
35using log4net;
35using Nwc.XmlRpc; 36using Nwc.XmlRpc;
36using OpenSim.Framework.Console;
37using OpenSim.Framework.Statistics; 37using OpenSim.Framework.Statistics;
38 38
39namespace OpenSim.Framework.UserManagement 39namespace 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
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml; 29using System.Xml;
32 30
33namespace OpenSim.Framework.Communications.XMPP 31namespace 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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml;
32using OpenSim.Framework;
33
34namespace OpenSim.Framework.Communications.XMPP 28namespace OpenSim.Framework.Communications.XMPP
35{ 29{
36 public class XMPPParser 30 public class XMPPParser
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 1fb4866..e985c06 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -25,22 +25,24 @@
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
28using System;
28using System.IO; 29using System.IO;
29using System.Net; 30using System.Net;
31using System.Reflection;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Console; 33using log4net;
32 34
33namespace OpenSim.Framework.Configuration.HTTP 35namespace OpenSim.Framework.Configuration.HTTP
34{ 36{
35 public class HTTPConfiguration : IGenericConfig 37 public class HTTPConfiguration : IGenericConfig
36 { 38 {
37 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);
38 40
39 private RemoteConfigSettings remoteConfigSettings; 41 private RemoteConfigSettings remoteConfigSettings;
40 42
41 private XmlConfiguration xmlConfig; 43 private XmlConfiguration xmlConfig;
42 44
43 private string configFileName = System.String.Empty; 45 private string configFileName = String.Empty;
44 46
45 public HTTPConfiguration() 47 public HTTPConfiguration()
46 { 48 {
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index 88945ff..4e37ec6 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.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
28using System;
29
28namespace OpenSim.Framework.Configuration.HTTP 30namespace OpenSim.Framework.Configuration.HTTP
29{ 31{
30 public class RemoteConfigSettings 32 public class RemoteConfigSettings
31 { 33 {
32 private ConfigurationMember configMember; 34 private ConfigurationMember configMember;
33 35
34 public string baseConfigURL = System.String.Empty; 36 public string baseConfigURL = String.Empty;
35 37
36 public RemoteConfigSettings(string filename) 38 public RemoteConfigSettings(string filename)
37 { 39 {
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index c27a134..12590b4 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -32,13 +32,14 @@ using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using libsecondlife; 34using libsecondlife;
35using log4net;
35using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
36 37
37namespace OpenSim.Framework 38namespace OpenSim.Framework
38{ 39{
39 public class ConfigurationMember 40 public class ConfigurationMember
40 { 41 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 43
43 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); 44 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
44 45
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index ce95cb9..27ff340 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -28,14 +28,15 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.IO;
32using System.Net; 31using System.Net;
32using System.Reflection;
33using log4net;
33 34
34namespace OpenSim.Framework.Console 35namespace OpenSim.Framework.Console
35{ 36{
36 public class ConsoleBase 37 public class ConsoleBase
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 readonly object m_syncRoot = new object(); 41 private readonly object m_syncRoot = new object();
41 42
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 542a03f..86df3c0 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -26,14 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Text.RegularExpressions; 29using System.Text.RegularExpressions;
31using System.Globalization;
32
33using log4net.Core;
34using log4net.Layout;
35using log4net.Appender; 30using log4net.Appender;
36using log4net.Util; 31using log4net.Core;
37 32
38namespace OpenSim.Framework.Console 33namespace OpenSim.Framework.Console
39{ 34{
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 54baab9..66b0885 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -25,10 +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
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework 28namespace OpenSim.Framework
33{ 29{
34 public class Constants 30 public class Constants
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 49b36e9..98052fc 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -27,14 +27,15 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using OpenSim.Framework.Console; 32using log4net;
32 33
33namespace OpenSim.Framework 34namespace OpenSim.Framework
34{ 35{
35 public class EstateSettings 36 public class EstateSettings
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 //Settings to this island 40 //Settings to this island
40 private float m_billableFactor; 41 private float m_billableFactor;
diff --git a/OpenSim/Framework/FriendListItem.cs b/OpenSim/Framework/FriendListItem.cs
index 5a66683..9220705 100644
--- a/OpenSim/Framework/FriendListItem.cs
+++ b/OpenSim/Framework/FriendListItem.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
28using System;
29using System.Collections.Generic;
30using libsecondlife; 28using libsecondlife;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 9519f17..7ccd0c4 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Console;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index ef7abd1..77e5460 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 5bbf435..23c0642 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.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
28using System;
29using System.Collections.Generic;
30using libsecondlife; 28using libsecondlife;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs
index cfba135..6a500f8 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Framework/IInventoryData.cs
@@ -25,9 +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
28using System.Collections;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index abccf49..e5e8f62 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.cs
@@ -25,9 +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
28using System.Collections;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 7136efa..39a6930 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -25,7 +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
28using OpenSim.Framework.Console; 28using System;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
@@ -34,12 +34,12 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class InventoryConfig 35 public class InventoryConfig
36 { 36 {
37 public string DefaultStartupMsg = System.String.Empty; 37 public string DefaultStartupMsg = String.Empty;
38 public string UserServerURL = System.String.Empty; 38 public string UserServerURL = String.Empty;
39 public string UserSendKey = System.String.Empty; 39 public string UserSendKey = String.Empty;
40 public string UserRecvKey = System.String.Empty; 40 public string UserRecvKey = String.Empty;
41 41
42 public string DatabaseProvider = System.String.Empty; 42 public string DatabaseProvider = String.Empty;
43 public static uint DefaultHttpPort = 8004; 43 public static uint DefaultHttpPort = 8004;
44 44
45 public uint HttpPort = DefaultHttpPort; 45 public uint HttpPort = DefaultHttpPort;
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index ee53307..8e276e9 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.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
28using System.Collections;
29using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 03b47ca..8c8d858 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.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
28using System.Collections;
29using System.Collections.Generic;
30using System.Xml.Serialization;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/JId.cs b/OpenSim/Framework/JId.cs
index a685807..dac4838 100644
--- a/OpenSim/Framework/JId.cs
+++ b/OpenSim/Framework/JId.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
33{ 31{
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index f154e5e..6d2c5d7 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.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
28using System.Collections.Generic;
29using System; 28using System;
29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index bc1e8d0..bc3375d 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.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
28using System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
@@ -39,7 +40,7 @@ namespace OpenSim.Framework
39 public LLUUID InventoryFolder; 40 public LLUUID InventoryFolder;
40 public LLUUID BaseFolder; 41 public LLUUID BaseFolder;
41 public uint CircuitCode; 42 public uint CircuitCode;
42 public string CapsPath = System.String.Empty; 43 public string CapsPath = String.Empty;
43 public LLVector3 StartPos; 44 public LLVector3 StartPos;
44 45
45 public Login() 46 public Login()
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index f15efa6..dbc06db 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -26,9 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Console;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
34{ 31{
@@ -69,7 +66,7 @@ namespace OpenSim.Framework
69 configMember.addConfigurationOption("default_user_server", 66 configMember.addConfigurationOption("default_user_server",
70 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 67 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
71 "Default User Server URI", 68 "Default User Server URI",
72 "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort.ToString() + "/", false); 69 "http://127.0.0.1:" + DefaultHttpPort.ToString() + "/", false);
73 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 70 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
74 "Key to send to user server", "null", false); 71 "Key to send to user server", "null", false);
75 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 72 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index df559fc..ee11924 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.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
28using Nini.Config;
29using System; 28using System;
29using Nini.Config;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 31548a0..22f952a 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -26,8 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net;
30using System.Collections; 29using System.Collections;
30using System.Net;
31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
32 33
33namespace OpenSim.Framework 34namespace OpenSim.Framework
@@ -115,13 +116,13 @@ namespace OpenSim.Framework
115 { 116 {
116 byte[] decoded_header = new byte[10 + 8]; 117 byte[] decoded_header = new byte[10 + 8];
117 ushort id; 118 ushort id;
118 libsecondlife.PacketFrequency freq; 119 PacketFrequency freq;
119 120
120 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); 121 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
121 122
122 if((bytes[0] & libsecondlife.Helpers.MSG_ZEROCODED)!=0) 123 if((bytes[0] & Helpers.MSG_ZEROCODED)!=0)
123 { 124 {
124 libsecondlife.Helpers.ZeroDecodeCommand(bytes, decoded_header); 125 Helpers.ZeroDecodeCommand(bytes, decoded_header);
125 } 126 }
126 127
127 if (decoded_header[6] == 0xFF) 128 if (decoded_header[6] == 0xFF)
@@ -129,18 +130,18 @@ namespace OpenSim.Framework
129 if (decoded_header[7] == 0xFF) 130 if (decoded_header[7] == 0xFF)
130 { 131 {
131 id = (ushort)((decoded_header[8] << 8) + decoded_header[9]); 132 id = (ushort)((decoded_header[8] << 8) + decoded_header[9]);
132 freq = libsecondlife.PacketFrequency.Low; 133 freq = PacketFrequency.Low;
133 } 134 }
134 else 135 else
135 { 136 {
136 id = (ushort)decoded_header[7]; 137 id = (ushort)decoded_header[7];
137 freq = libsecondlife.PacketFrequency.Medium; 138 freq = PacketFrequency.Medium;
138 } 139 }
139 } 140 }
140 else 141 else
141 { 142 {
142 id = (ushort)decoded_header[6]; 143 id = (ushort)decoded_header[6];
143 freq = libsecondlife.PacketFrequency.High; 144 freq = PacketFrequency.High;
144 } 145 }
145 146
146 return Packet.GetType(id, freq); 147 return Packet.GetType(id, freq);
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index ee2079b..73971ac 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.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
28using System.Collections.Generic;
29using System; 28using System;
29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index f19f1db..20a2709 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -31,7 +31,6 @@ using System.Net.Sockets;
31using System.Xml; 31using System.Xml;
32using libsecondlife; 32using libsecondlife;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework.Console;
35 34
36namespace OpenSim.Framework 35namespace OpenSim.Framework
37{ 36{
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index ad8b4a0..cfaaf02 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.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
28using System;
28using System.IO; 29using System.IO;
29using Nini.Config; 30using Nini.Config;
30 31
@@ -48,7 +49,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
48 IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"]; 49 IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"];
49 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim(); 50 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
50 } 51 }
51 catch (System.Exception) 52 catch (Exception)
52 { 53 {
53 // No INI setting recorded. 54 // No INI setting recorded.
54 } 55 }
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 098e305..17077e7 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -25,17 +25,19 @@
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
28using System;
28using System.IO; 29using System.IO;
29using System.Net; 30using System.Net;
31using System.Reflection;
30using System.Xml; 32using System.Xml;
33using log4net;
31using Nini.Config; 34using Nini.Config;
32using OpenSim.Framework.Console;
33 35
34namespace OpenSim.Framework.RegionLoader.Web 36namespace OpenSim.Framework.RegionLoader.Web
35{ 37{
36 public class RegionLoaderWebServer : IRegionLoader 38 public class RegionLoaderWebServer : IRegionLoader
37 { 39 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 41
40 private IniConfigSource m_configSouce; 42 private IniConfigSource m_configSouce;
41 43
@@ -54,8 +56,8 @@ namespace OpenSim.Framework.RegionLoader.Web
54 else 56 else
55 { 57 {
56 IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; 58 IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"];
57 string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim(); 59 string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
58 if (url == System.String.Empty) 60 if (url == String.Empty)
59 { 61 {
60 m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty."); 62 m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty.");
61 return null; 63 return null;
@@ -68,7 +70,7 @@ namespace OpenSim.Framework.RegionLoader.Web
68 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); 70 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
69 m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server..."); 71 m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server...");
70 StreamReader reader = new StreamReader(webResponse.GetResponseStream()); 72 StreamReader reader = new StreamReader(webResponse.GetResponseStream());
71 string xmlSource = System.String.Empty; 73 string xmlSource = String.Empty;
72 string tempStr = reader.ReadLine(); 74 string tempStr = reader.ReadLine();
73 while (tempStr != null) 75 while (tempStr != null)
74 { 76 {
diff --git a/OpenSim/Framework/RegionUpData.cs b/OpenSim/Framework/RegionUpData.cs
index c2a7763..6162171 100644
--- a/OpenSim/Framework/RegionUpData.cs
+++ b/OpenSim/Framework/RegionUpData.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
33{ 31{
diff --git a/OpenSim/Framework/SerializableInventory.cs b/OpenSim/Framework/SerializableInventory.cs
index 529f91e..8193fa7 100644
--- a/OpenSim/Framework/SerializableInventory.cs
+++ b/OpenSim/Framework/SerializableInventory.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic;
30using System.Xml.Serialization; 29using System.Xml.Serialization;
31using libsecondlife;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 00c81c8..7c268ed 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -30,18 +30,20 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net; 32using System.Net;
33using System.Net.Sockets;
34using System.Reflection;
33using System.Text; 35using System.Text;
34using System.Threading; 36using System.Threading;
35using System.Xml; 37using System.Xml;
36using Nwc.XmlRpc;
37using libsecondlife.StructuredData; 38using libsecondlife.StructuredData;
38using OpenSim.Framework.Console; 39using log4net;
40using Nwc.XmlRpc;
39 41
40namespace OpenSim.Framework.Servers 42namespace OpenSim.Framework.Servers
41{ 43{
42 public class BaseHttpServer 44 public class BaseHttpServer
43 { 45 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 47
46 protected Thread m_workerThread; 48 protected Thread m_workerThread;
47 protected HttpListener m_httpListener; 49 protected HttpListener m_httpListener;
@@ -199,7 +201,7 @@ namespace OpenSim.Framework.Servers
199 } 201 }
200 } 202 }
201 } 203 }
202 catch (System.Net.Sockets.SocketException e) 204 catch (SocketException e)
203 { 205 {
204 // At least on linux, it appears that if the client makes a request without requiring the response, 206 // At least on linux, it appears that if the client makes a request without requiring the response,
205 // an unconnected socket exception is thrown when we close the response output stream. There's no 207 // an unconnected socket exception is thrown when we close the response output stream. There's no
@@ -346,7 +348,7 @@ namespace OpenSim.Framework.Servers
346 { 348 {
347 response.OutputStream.Close(); 349 response.OutputStream.Close();
348 } 350 }
349 catch (System.Net.Sockets.SocketException) 351 catch (SocketException)
350 { 352 {
351 // This has to be here to prevent a Linux/Mono crash 353 // This has to be here to prevent a Linux/Mono crash
352 } 354 }
@@ -602,7 +604,7 @@ namespace OpenSim.Framework.Servers
602 m_workerThread.Name = "HttpThread"; 604 m_workerThread.Name = "HttpThread";
603 m_workerThread.IsBackground = true; 605 m_workerThread.IsBackground = true;
604 m_workerThread.Start(); 606 m_workerThread.Start();
605 OpenSim.Framework.ThreadTracker.Add(m_workerThread); 607 ThreadTracker.Add(m_workerThread);
606 } 608 }
607 609
608 private void StartHTTP() 610 private void StartHTTP()
diff --git a/OpenSim/Framework/Servers/GenericHTTPMethod.cs b/OpenSim/Framework/Servers/GenericHTTPMethod.cs
index f6bd65b..1358a00 100644
--- a/OpenSim/Framework/Servers/GenericHTTPMethod.cs
+++ b/OpenSim/Framework/Servers/GenericHTTPMethod.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
28using System;
29using System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/MessageServerInfo.cs b/OpenSim/Framework/Servers/MessageServerInfo.cs
index 9bcd4e1..17b5f10 100644
--- a/OpenSim/Framework/Servers/MessageServerInfo.cs
+++ b/OpenSim/Framework/Servers/MessageServerInfo.cs
@@ -25,9 +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
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
33{ 31{
diff --git a/OpenSim/Framework/Statistics/AssetStatsReporter.cs b/OpenSim/Framework/Statistics/AssetStatsReporter.cs
index 00422a8..66eb471 100644
--- a/OpenSim/Framework/Statistics/AssetStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/AssetStatsReporter.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Timers; 29using System.Timers;
31 30
32namespace OpenSim.Framework.Statistics 31namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs b/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs
index bef509d..0d85919 100644
--- a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs
+++ b/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.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
28using System;
29
30namespace OpenSim.Framework.Statistics.Interfaces 28namespace OpenSim.Framework.Statistics.Interfaces
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
index 167b771..567d8dd 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
@@ -28,11 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31
32using OpenSim.Framework;
33using OpenSim.Framework.Statistics.Interfaces;
34
35using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Statistics.Interfaces;
36 33
37namespace OpenSim.Framework.Statistics 34namespace OpenSim.Framework.Statistics
38{ 35{
diff --git a/OpenSim/Framework/Statistics/UserStatsReporter.cs b/OpenSim/Framework/Statistics/UserStatsReporter.cs
index e7c9bce..ce82615 100644
--- a/OpenSim/Framework/Statistics/UserStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/UserStatsReporter.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
28using System.Text;
29using System.Timers; 28using System.Timers;
30 29
31namespace OpenSim.Framework.Statistics 30namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 36228b5..1cf2e58 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -25,13 +25,14 @@
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
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
29using System.Xml; 31using System.Xml;
30using System.Xml.Schema; 32using System.Xml.Schema;
31using System.Xml.Serialization; 33using System.Xml.Serialization;
32
33using libsecondlife; 34using libsecondlife;
34using System; 35using log4net;
35 36
36namespace OpenSim.Framework 37namespace OpenSim.Framework
37{ 38{
@@ -43,7 +44,7 @@ namespace OpenSim.Framework
43 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
44 ICloneable, IXmlSerializable 45 ICloneable, IXmlSerializable
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 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem)); 49 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem));
49 50
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index b71a0e1..8fe5b82 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using System.Threading; 31using System.Threading;
33 32
34namespace OpenSim.Framework 33namespace OpenSim.Framework
@@ -36,7 +35,7 @@ namespace OpenSim.Framework
36 public static class ThreadTracker 35 public static class ThreadTracker
37 { 36 {
38 public static List<ThreadTrackerItem> m_Threads; 37 public static List<ThreadTrackerItem> m_Threads;
39 public static System.Threading.Thread ThreadTrackerThread; 38 public static Thread ThreadTrackerThread;
40 private static readonly long ThreadTimeout = 30 * 10000000; 39 private static readonly long ThreadTimeout = 30 * 10000000;
41 40
42 static ThreadTracker() 41 static ThreadTracker()
@@ -46,7 +45,7 @@ namespace OpenSim.Framework
46 ThreadTrackerThread = new Thread(ThreadTrackerThreadLoop); 45 ThreadTrackerThread = new Thread(ThreadTrackerThreadLoop);
47 ThreadTrackerThread.Name = "ThreadTrackerThread"; 46 ThreadTrackerThread.Name = "ThreadTrackerThread";
48 ThreadTrackerThread.IsBackground = true; 47 ThreadTrackerThread.IsBackground = true;
49 ThreadTrackerThread.Priority = System.Threading.ThreadPriority.BelowNormal; 48 ThreadTrackerThread.Priority = ThreadPriority.BelowNormal;
50 ThreadTrackerThread.Start(); 49 ThreadTrackerThread.Start();
51#endif 50#endif
52 } 51 }
@@ -60,7 +59,7 @@ namespace OpenSim.Framework
60 } 59 }
61 } 60 }
62 61
63 public static void Add(System.Threading.Thread thread) 62 public static void Add(Thread thread)
64 { 63 {
65#if DEBUG 64#if DEBUG
66 lock (m_Threads) 65 lock (m_Threads)
@@ -73,7 +72,7 @@ namespace OpenSim.Framework
73#endif 72#endif
74 } 73 }
75 74
76 public static void Remove(System.Threading.Thread thread) 75 public static void Remove(Thread thread)
77 { 76 {
78#if DEBUG 77#if DEBUG
79 lock (m_Threads) 78 lock (m_Threads)
@@ -126,7 +125,7 @@ namespace OpenSim.Framework
126 125
127 public class ThreadTrackerItem 126 public class ThreadTrackerItem
128 { 127 {
129 public System.Threading.Thread Thread; 128 public Thread Thread;
130 public long LastSeenActive; 129 public long LastSeenActive;
131 } 130 }
132 } 131 }
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 8335bba..8ae8f7e 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Console;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ac1145f..2396519 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -26,24 +26,26 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.IO; 30using System.IO;
32using System.Net; 31using System.Net;
33using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection;
34using System.Runtime.Serialization;
35using System.Runtime.Serialization.Formatters.Binary;
34using System.Security.Cryptography; 36using System.Security.Cryptography;
35using System.Text; 37using System.Text;
38using System.Text.RegularExpressions;
36using libsecondlife; 39using libsecondlife;
40using log4net;
37using Nini.Config; 41using Nini.Config;
38using Nwc.XmlRpc; 42using Nwc.XmlRpc;
39 43
40using System.Runtime.Serialization;
41using System.Runtime.Serialization.Formatters.Binary;
42namespace OpenSim.Framework 44namespace OpenSim.Framework
43{ 45{
44 public class Util 46 public class Util
45 { 47 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 49
48 private static Random randomClass = new Random(); 50 private static Random randomClass = new Random();
49 private static uint nextXferID = 5000; 51 private static uint nextXferID = 5000;
@@ -385,7 +387,7 @@ namespace OpenSim.Framework
385 /// <returns>safe path</returns> 387 /// <returns>safe path</returns>
386 public static string safePath(string path) 388 public static string safePath(string path)
387 { 389 {
388 return System.Text.RegularExpressions.Regex.Replace(path, @regexInvalidPathChars, string.Empty); 390 return Regex.Replace(path, @regexInvalidPathChars, string.Empty);
389 } 391 }
390 392
391 /// <summary> 393 /// <summary>
@@ -395,7 +397,7 @@ namespace OpenSim.Framework
395 /// <returns>safe filename</returns> 397 /// <returns>safe filename</returns>
396 public static string safeFileName(string filename) 398 public static string safeFileName(string filename)
397 { 399 {
398 return System.Text.RegularExpressions.Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ; 400 return Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ;
399 } 401 }
400 402
401 // 403 //
@@ -520,7 +522,7 @@ namespace OpenSim.Framework
520 sr.Close(); 522 sr.Close();
521 return issue; 523 return issue;
522 } 524 }
523 catch (System.Exception) 525 catch (Exception)
524 { 526 {
525 return ""; 527 return "";
526 } 528 }