ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Optimised using statements and namespace references across entire project (this took a while to run).

Browse Source
This commit is contained in:
Adam Frisby
2008-04-21 07:09:17 +00:00
parent 05e24c8f58
commit fef3b36894
306 changed files with 1011 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/AgentInventory.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
@@ -230,7 +231,7 @@ namespace OpenSim.Framework
public LLUUID CreatorID;
public sbyte InvType;
public sbyte Type;
public string Name = System.String.Empty;
public string Name = String.Empty;
public string Description;
public InventoryItem()
@@ -241,7 +242,7 @@ namespace OpenSim.Framework
public string ExportString()
{
string typ = "notecard";
string result = System.String.Empty;
string result = String.Empty;
result += "\tinv_object\t0\n\t{\n";
result += "\t\tobj_id\t%s\n";
result += "\t\tparent_id\t" + ItemID.ToString() + "\n";

1
OpenSim/Framework/AssetConfig.cs
View File

@@ -26,7 +26,6 @@
*/
using System;
using OpenSim.Framework.Console;
namespace OpenSim.Framework
{

8
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@@ -28,14 +28,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Xml;
using libsecondlife;
using log4net;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Console;
/// <summary>
/// Loads assets from the filesystem location. Not yet a plugin, though it should be.
/// </summary>
@@ -43,7 +41,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
{
public class AssetLoaderFileSystem : IAssetLoader
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage)
{

3
OpenSim/Framework/AvatarPickerAvatar.cs
View File

@@ -25,9 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Framework

6
OpenSim/Framework/AvatarWearable.cs
View File

@@ -25,10 +25,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using libsecondlife;
using System;
using System.Runtime.Serialization;
using System.Security.Permissions;
using libsecondlife;
namespace OpenSim.Framework
{
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
//System.Console.WriteLine("AvatarWearable Deserialize BGN");
if (info == null)
{
throw new System.ArgumentNullException("info");
throw new ArgumentNullException("info");
}
AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid)));
@@ -93,7 +93,7 @@ namespace OpenSim.Framework
{
if (info == null)
{
throw new System.ArgumentNullException("info");
throw new ArgumentNullException("info");
}
info.AddValue("AssetID", AssetID.UUID);

8
OpenSim/Framework/ClientManager.cs
View File

@@ -27,8 +27,10 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using libsecondlife.Packets;
using log4net;
namespace OpenSim.Framework
{
@@ -36,7 +38,7 @@ namespace OpenSim.Framework
public class ClientManager
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Dictionary<uint, IClientAPI> m_clients;
@@ -56,7 +58,7 @@ namespace OpenSim.Framework
{
whatToDo(LocalClients[i]);
}
catch (System.Exception e)
catch (Exception e)
{
m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString());
}
@@ -129,7 +131,7 @@ namespace OpenSim.Framework
client.Close(false);
}
}
catch (System.Exception e)
catch (Exception e)
{
m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e));
}

3
OpenSim/Framework/Communications/CAPSService.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using OpenSim.Framework.Servers;
namespace OpenSim.Framework.Communications
@@ -47,7 +48,7 @@ namespace OpenSim.Framework.Communications
public string CapsRequest(string request, string path, string param)
{
System.Console.WriteLine("new caps request " + request + " from path " + path);
return System.String.Empty;
return String.Empty;
}
}
}

10
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -27,11 +27,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Console;
using log4net;
using OpenSim.Framework.Statistics;
namespace OpenSim.Framework.Communications.Cache
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary>
public class AssetCache : IAssetReceiver
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// The cache of assets. This does not include textures.
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Communications.Cache
m_assetCacheThread.Name = "AssetCacheThread";
m_assetCacheThread.IsBackground = true;
m_assetCacheThread.Start();
OpenSim.Framework.ThreadTracker.Add(m_assetCacheThread);
ThreadTracker.Add(m_assetCacheThread);
}
/// <summary>

5
OpenSim/Framework/Communications/Cache/AssetServer.cs
View File

@@ -25,16 +25,17 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.IO;
using System.Reflection;
using Db4objects.Db4o;
using Db4objects.Db4o.Query;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework.Communications.Cache
{
public class LocalAssetServer : AssetServerBase
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IObjectContainer db;

10
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@@ -26,18 +26,18 @@
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
using OpenSim.Framework.AssetLoader.Filesystem;
namespace OpenSim.Framework.Communications.Cache
{
public abstract class AssetServerBase : IAssetServer
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected IAssetReceiver m_receiver;
protected BlockingQueue<AssetRequest> m_assetRequests;
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache
m_localAssetServerThread.Name = "LocalAssetServerThread";
m_localAssetServerThread.IsBackground = true;
m_localAssetServerThread.Start();
OpenSim.Framework.ThreadTracker.Add(m_localAssetServerThread);
ThreadTracker.Add(m_localAssetServerThread);
}
private void RunRequests()

7
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@@ -27,8 +27,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using log4net;
namespace OpenSim.Framework.Communications.Cache
{
@@ -37,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary>
public class CachedUserInfo
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// The comms manager holds references to services (user, grid, inventory, etc.)

5
OpenSim/Framework/Communications/Cache/GridAssetClient.cs
View File

@@ -27,15 +27,16 @@
using System;
using System.IO;
using System.Reflection;
using System.Xml.Serialization;
using OpenSim.Framework.Console;
using log4net;
using OpenSim.Framework.Servers;
namespace OpenSim.Framework.Communications.Cache
{
public class GridAssetClient : AssetServerBase
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string _assetServerUrl;

13
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@@ -28,10 +28,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Xml;
using libsecondlife;
using log4net;
using Nini.Config;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Communications.Cache
{
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary>
public class LibraryRootFolder : InventoryFolderImpl
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
@@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache
{
string foldersPath
= Path.Combine(
Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty));
Util.inventoryDir(), config.GetString("foldersFile", String.Empty));
LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
string itemsPath
= Path.Combine(
Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty));
Util.inventoryDir(), config.GetString("itemsFile", String.Empty));
LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
}
@@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString()));
item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
item.Folder = new LLUUID(config.GetString("folderID", ID.ToString()));
item.Description = config.GetString("description", System.String.Empty);
item.Name = config.GetString("name", System.String.Empty);
item.Description = config.GetString("description", String.Empty);
item.Name = config.GetString("name", String.Empty);
item.AssetType = config.GetInt("assetType", 0);
item.InvType = config.GetInt("inventoryType", 0);
item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);

4
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@@ -27,13 +27,13 @@
using System;
using System.Reflection;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework.Communications.Cache
{
public class SQLAssetServer : AssetServerBase
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public SQLAssetServer(string pluginName)
{

10
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@@ -25,13 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework.Communications.Cache
{
@@ -40,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary>
public class UserProfileCacheService
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// The comms manager holds references to services (user, grid, inventory, etc.)

9
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@@ -29,12 +29,11 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
namespace OpenSim.Region.Capabilities
@@ -66,8 +65,8 @@ namespace OpenSim.Region.Capabilities
public class Caps
{
private static readonly log4net.ILog m_log =
log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_httpListenerHostName;
private uint m_httpListenPort;

6
OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
View File

@@ -25,14 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using libsecondlife;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
namespace OpenSim.Region.Capabilities

2
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
View File

@@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using libsecondlife;
using System;
using libsecondlife;
namespace OpenSim.Region.Capabilities
{

9
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using libsecondlife;
namespace OpenSim.Region.Capabilities
@@ -32,11 +33,11 @@ namespace OpenSim.Region.Capabilities
[LLSDMap]
public class LLSDAssetUploadRequest
{
public string asset_type = System.String.Empty;
public string description = System.String.Empty;
public string asset_type = String.Empty;
public string description = String.Empty;
public LLUUID folder_id = LLUUID.Zero;
public string inventory_type = System.String.Empty;
public string name = System.String.Empty;
public string inventory_type = String.Empty;
public string name = String.Empty;
public LLSDAssetUploadRequest()
{

6
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
View File

@@ -25,13 +25,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.Region.Capabilities
{
[LLSDMap]
public class LLSDAssetUploadResponse
{
public string uploader = System.String.Empty;
public string state = System.String.Empty;
public string uploader = String.Empty;
public string state = String.Empty;
public LLSDAssetUploadResponse()
{

3
OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
View File

@@ -25,9 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Region.Capabilities

1
OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
View File

@@ -27,7 +27,6 @@
*/
using System.Collections;
using libsecondlife;
namespace OpenSim.Region.Capabilities
{

2
OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
View File

@@ -26,8 +26,6 @@
*
*/
using libsecondlife;
namespace OpenSim.Region.Capabilities
{
[LLSDMap]

4
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@@ -27,7 +27,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
@@ -36,7 +38,7 @@ namespace OpenSim.Framework.Communications
{
public class CommunicationsManager
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected IUserService m_userService;

2
OpenSim/Framework/Communications/IInventoryServices.cs
View File

@@ -26,9 +26,7 @@
*/
using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Framework.Communications

6
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@@ -29,14 +29,14 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework.Communications
{
public abstract class InventoryServiceBase : IInventoryServices
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();

2
OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
View File

@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.Framework.Communications.Limit
{
/// <summary>

2
OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
View File

@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.Framework.Communications.Limit
{
/// <summary>

1
OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
View File

@@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
namespace OpenSim.Framework.Communications.Limit

2
OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
View File

@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Communications.Limit
{
if (!IsMonitoringRequests(id))
{
requests.Add(id, new Request(System.DateTime.Now));
requests.Add(id, new Request(DateTime.Now));
}
}

5
OpenSim/Framework/Communications/LoginResponse.cs
View File

@@ -28,10 +28,11 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using libsecondlife.StructuredData;
using log4net;
using Nwc.XmlRpc;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.UserManagement
{
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.UserManagement
/// </summary>
public class LoginResponse
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Hashtable loginFlagsHash;
private Hashtable globalTexturesHash;

11
OpenSim/Framework/Communications/LoginService.cs
View File

@@ -29,21 +29,22 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Threading;
using System.Web;
using libsecondlife;
using libsecondlife.StructuredData;
using log4net;
using Nwc.XmlRpc;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Statistics;
namespace OpenSim.Framework.UserManagement
{
public abstract class LoginService
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected string m_welcomeMessage = "Welcome to OpenSim";
protected UserManagerBase m_userManager = null;
@@ -159,7 +160,7 @@ namespace OpenSim.Framework.UserManagement
{
webloginkey = new LLUUID((string)requestData["web_login_key"]);
}
catch (System.Exception e)
catch (Exception e)
{
m_log.InfoFormat(
"[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}",
@@ -514,7 +515,7 @@ namespace OpenSim.Framework.UserManagement
statuscode = 301;
string redirectURL = "about:blank?redirect-http-hack=" +
System.Web.HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
lastname +
"&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
//m_log.Info("[WEB]: R:" + redirectURL);

5
OpenSim/Framework/Communications/RestClient/RestClient.cs
View File

@@ -29,10 +29,11 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Text;
using System.Threading;
using System.Web;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework.Communications
{
@@ -55,7 +56,7 @@ namespace OpenSim.Framework.Communications
/// </remarks>
public class RestClient
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string realuri;

6
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -32,8 +32,8 @@ using System.Reflection;
using System.Security.Cryptography;
using libsecondlife;
using libsecondlife.StructuredData;
using log4net;
using Nwc.XmlRpc;
using OpenSim.Framework.Console;
using OpenSim.Framework.Statistics;
namespace OpenSim.Framework.UserManagement
@@ -43,8 +43,8 @@ namespace OpenSim.Framework.UserManagement
/// </summary>
public abstract class UserManagerBase : IUserService
{
private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public UserConfig _config;
private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();

2
OpenSim/Framework/Communications/XMPP/Stanza.cs
View File

@@ -26,8 +26,6 @@
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
namespace OpenSim.Framework.Communications.XMPP

6
OpenSim/Framework/Communications/XMPP/XMPPParser.cs
View File

@@ -25,12 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
using OpenSim.Framework;
namespace OpenSim.Framework.Communications.XMPP
{
public class XMPPParser

8
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@@ -25,22 +25,24 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Net;
using System.Reflection;
using System.Text;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework.Configuration.HTTP
{
public class HTTPConfiguration : IGenericConfig
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private RemoteConfigSettings remoteConfigSettings;
private XmlConfiguration xmlConfig;
private string configFileName = System.String.Empty;
private string configFileName = String.Empty;
public HTTPConfiguration()
{

4
OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
View File

@@ -25,13 +25,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.Framework.Configuration.HTTP
{
public class RemoteConfigSettings
{
private ConfigurationMember configMember;
public string baseConfigURL = System.String.Empty;
public string baseConfigURL = String.Empty;
public RemoteConfigSettings(string filename)
{

3
OpenSim/Framework/ConfigurationMember.cs
View File

@@ -32,13 +32,14 @@ using System.Net;
using System.Reflection;
using System.Xml;
using libsecondlife;
using log4net;
using OpenSim.Framework.Console;
namespace OpenSim.Framework
{
public class ConfigurationMember
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);

5
OpenSim/Framework/Console/ConsoleBase.cs
View File

@@ -28,14 +28,15 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Reflection;
using log4net;
namespace OpenSim.Framework.Console
{
public class ConsoleBase
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly object m_syncRoot = new object();

7
OpenSim/Framework/Console/OpenSimAppender.cs
View File

@@ -26,14 +26,9 @@
*/
using System;
using System.Text;
using System.Text.RegularExpressions;
using System.Globalization;
using log4net.Core;
using log4net.Layout;
using log4net.Appender;
using log4net.Util;
using log4net.Core;
namespace OpenSim.Framework.Console
{

4
OpenSim/Framework/Constants.cs
View File

@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{
public class Constants

5
OpenSim/Framework/EstateSettings.cs
View File

@@ -27,14 +27,15 @@
using System;
using System.IO;
using System.Reflection;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Framework
{
public class EstateSettings
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//Settings to this island
private float m_billableFactor;

2
OpenSim/Framework/FriendListItem.cs
View File

@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using libsecondlife;
namespace OpenSim.Framework

1
OpenSim/Framework/GridConfig.cs
View File

@@ -26,7 +26,6 @@
*/
using System;
using OpenSim.Framework.Console;
namespace OpenSim.Framework
{

1
OpenSim/Framework/GridInstantMessage.cs
View File

@@ -26,7 +26,6 @@
*/
using System;
using OpenSim.Framework;
namespace OpenSim.Framework
{

2
OpenSim/Framework/IAssetServer.cs
View File

@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using libsecondlife;
namespace OpenSim.Framework

2
OpenSim/Framework/IInventoryData.cs
View File

@@ -25,9 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections;
using System.Collections.Generic;
using System.Xml.Serialization;
using libsecondlife;
namespace OpenSim.Framework

2
OpenSim/Framework/InventoryCollection.cs
View File

@@ -25,9 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections;
using System.Collections.Generic;
using System.Xml.Serialization;
using libsecondlife;
namespace OpenSim.Framework

12
OpenSim/Framework/InventoryConfig.cs
View File

@@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenSim.Framework.Console;
using System;
namespace OpenSim.Framework
{
@@ -34,12 +34,12 @@ namespace OpenSim.Framework
/// </summary>
public class InventoryConfig
{
public string DefaultStartupMsg = System.String.Empty;
public string UserServerURL = System.String.Empty;
public string UserSendKey = System.String.Empty;
public string UserRecvKey = System.String.Empty;
public string DefaultStartupMsg = String.Empty;
public string UserServerURL = String.Empty;
public string UserSendKey = String.Empty;
public string UserRecvKey = String.Empty;
public string DatabaseProvider = System.String.Empty;
public string DatabaseProvider = String.Empty;
public static uint DefaultHttpPort = 8004;
public uint HttpPort = DefaultHttpPort;

3
OpenSim/Framework/InventoryFolderBase.cs
View File

@@ -25,9 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections;
using System.Collections.Generic;
using System.Xml.Serialization;
using libsecondlife;
namespace OpenSim.Framework

3
OpenSim/Framework/InventoryItemBase.cs
View File

@@ -25,9 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections;
using System.Collections.Generic;
using System.Xml.Serialization;
using libsecondlife;
namespace OpenSim.Framework

2
OpenSim/Framework/JId.cs
View File

@@ -26,8 +26,6 @@
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{

2
OpenSim/Framework/LandData.cs
View File

@@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using libsecondlife;
namespace OpenSim.Framework

3
OpenSim/Framework/Login.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using libsecondlife;
namespace OpenSim.Framework
@@ -39,7 +40,7 @@ namespace OpenSim.Framework
public LLUUID InventoryFolder;
public LLUUID BaseFolder;
public uint CircuitCode;
public string CapsPath = System.String.Empty;
public string CapsPath = String.Empty;
public LLVector3 StartPos;
public Login()

5
OpenSim/Framework/MessageServerConfig.cs
View File

@@ -26,9 +26,6 @@
*/
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Console;
namespace OpenSim.Framework
{
@@ -69,7 +66,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("default_user_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default User Server URI",
"http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort.ToString() + "/", false);
"http://127.0.0.1:" + DefaultHttpPort.ToString() + "/", false);
configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to user server", "null", false);
configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

2
OpenSim/Framework/NetworkServersInfo.cs
View File

@@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using Nini.Config;
using System;
using Nini.Config;
namespace OpenSim.Framework
{

15
OpenSim/Framework/PacketPool.cs
View File

@@ -26,8 +26,9 @@
*/
using System;
using System.Net;
using System.Collections;
using System.Net;
using libsecondlife;
using libsecondlife.Packets;
namespace OpenSim.Framework
@@ -115,13 +116,13 @@ namespace OpenSim.Framework
{
byte[] decoded_header = new byte[10 + 8];
ushort id;
libsecondlife.PacketFrequency freq;
PacketFrequency freq;
Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
if((bytes[0] & libsecondlife.Helpers.MSG_ZEROCODED)!=0)
if((bytes[0] & Helpers.MSG_ZEROCODED)!=0)
{
libsecondlife.Helpers.ZeroDecodeCommand(bytes, decoded_header);
Helpers.ZeroDecodeCommand(bytes, decoded_header);
}
if (decoded_header[6] == 0xFF)
@@ -129,18 +130,18 @@ namespace OpenSim.Framework
if (decoded_header[7] == 0xFF)
{
id = (ushort)((decoded_header[8] << 8) + decoded_header[9]);
freq = libsecondlife.PacketFrequency.Low;
freq = PacketFrequency.Low;
}
else
{
id = (ushort)decoded_header[7];
freq = libsecondlife.PacketFrequency.Medium;
freq = PacketFrequency.Medium;
}
}
else
{
id = (ushort)decoded_header[6];
freq = libsecondlife.PacketFrequency.High;
freq = PacketFrequency.High;
}
return Packet.GetType(id, freq);

2
OpenSim/Framework/RegionCommsListener.cs
View File

@@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using libsecondlife;
namespace OpenSim.Framework

1
OpenSim/Framework/RegionInfo.cs
View File

@@ -31,7 +31,6 @@ using System.Net.Sockets;
using System.Xml;
using libsecondlife;
using Nini.Config;
using OpenSim.Framework.Console;
namespace OpenSim.Framework
{

3
OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using Nini.Config;
@@ -48,7 +49,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"];
regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
}
catch (System.Exception)
catch (Exception)
{
// No INI setting recorded.
}

12
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
View File

@@ -25,17 +25,19 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Net;
using System.Reflection;
using System.Xml;
using log4net;
using Nini.Config;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.RegionLoader.Web
{
public class RegionLoaderWebServer : IRegionLoader
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IniConfigSource m_configSouce;
@@ -54,8 +56,8 @@ namespace OpenSim.Framework.RegionLoader.Web
else
{
IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"];
string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim();
if (url == System.String.Empty)
string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
if (url == String.Empty)
{
m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty.");
return null;
@@ -68,7 +70,7 @@ namespace OpenSim.Framework.RegionLoader.Web
HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server...");
StreamReader reader = new StreamReader(webResponse.GetResponseStream());
string xmlSource = System.String.Empty;
string xmlSource = String.Empty;
string tempStr = reader.ReadLine();
while (tempStr != null)
{

2
OpenSim/Framework/RegionUpData.cs
View File

@@ -26,8 +26,6 @@
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{

2
OpenSim/Framework/SerializableInventory.cs
View File

@@ -26,9 +26,7 @@
*/
using System.Collections;
using System.Collections.Generic;
using System.Xml.Serialization;
using libsecondlife;
namespace OpenSim.Framework
{

14
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -30,18 +30,20 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using System.Text;
using System.Threading;
using System.Xml;
using Nwc.XmlRpc;
using libsecondlife.StructuredData;
using OpenSim.Framework.Console;
using log4net;
using Nwc.XmlRpc;
namespace OpenSim.Framework.Servers
{
public class BaseHttpServer
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Thread m_workerThread;
protected HttpListener m_httpListener;
@@ -199,7 +201,7 @@ namespace OpenSim.Framework.Servers
}
}
}
catch (System.Net.Sockets.SocketException e)
catch (SocketException e)
{
// At least on linux, it appears that if the client makes a request without requiring the response,
// an unconnected socket exception is thrown when we close the response output stream. There's no
@@ -346,7 +348,7 @@ namespace OpenSim.Framework.Servers
{
response.OutputStream.Close();
}
catch (System.Net.Sockets.SocketException)
catch (SocketException)
{
// This has to be here to prevent a Linux/Mono crash
}
@@ -602,7 +604,7 @@ namespace OpenSim.Framework.Servers
m_workerThread.Name = "HttpThread";
m_workerThread.IsBackground = true;
m_workerThread.Start();
OpenSim.Framework.ThreadTracker.Add(m_workerThread);
ThreadTracker.Add(m_workerThread);
}
private void StartHTTP()

1
OpenSim/Framework/Servers/GenericHTTPMethod.cs
View File

@@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections;
namespace OpenSim.Framework.Servers

2
OpenSim/Framework/Servers/MessageServerInfo.cs
View File

@@ -25,9 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework.Servers
{

1
OpenSim/Framework/Statistics/AssetStatsReporter.cs
View File

@@ -26,7 +26,6 @@
*/
using System;
using System.Text;
using System.Timers;
namespace OpenSim.Framework.Statistics

2
OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs
View File

@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.Framework.Statistics.Interfaces
{
/// <summary>

5
OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
View File

@@ -28,11 +28,8 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework;
using OpenSim.Framework.Statistics.Interfaces;
using libsecondlife;
using OpenSim.Framework.Statistics.Interfaces;
namespace OpenSim.Framework.Statistics
{

1
OpenSim/Framework/Statistics/UserStatsReporter.cs
View File

@@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Text;
using System.Timers;
namespace OpenSim.Framework.Statistics

7
OpenSim/Framework/TaskInventoryItem.cs
View File

@@ -25,13 +25,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Xml;
using System.Xml.Schema;
using System.Xml.Serialization;
using libsecondlife;
using System;
using log4net;
namespace OpenSim.Framework
{
@@ -43,7 +44,7 @@ namespace OpenSim.Framework
public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
ICloneable, IXmlSerializable
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem));

11
OpenSim/Framework/ThreadTracker.cs
View File

@@ -28,7 +28,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.Threading;
namespace OpenSim.Framework
@@ -36,7 +35,7 @@ namespace OpenSim.Framework
public static class ThreadTracker
{
public static List<ThreadTrackerItem> m_Threads;
public static System.Threading.Thread ThreadTrackerThread;
public static Thread ThreadTrackerThread;
private static readonly long ThreadTimeout = 30 * 10000000;
static ThreadTracker()
@@ -46,7 +45,7 @@ namespace OpenSim.Framework
ThreadTrackerThread = new Thread(ThreadTrackerThreadLoop);
ThreadTrackerThread.Name = "ThreadTrackerThread";
ThreadTrackerThread.IsBackground = true;
ThreadTrackerThread.Priority = System.Threading.ThreadPriority.BelowNormal;
ThreadTrackerThread.Priority = ThreadPriority.BelowNormal;
ThreadTrackerThread.Start();
#endif
}
@@ -60,7 +59,7 @@ namespace OpenSim.Framework
}
}
public static void Add(System.Threading.Thread thread)
public static void Add(Thread thread)
{
#if DEBUG
lock (m_Threads)
@@ -73,7 +72,7 @@ namespace OpenSim.Framework
#endif
}
public static void Remove(System.Threading.Thread thread)
public static void Remove(Thread thread)
{
#if DEBUG
lock (m_Threads)
@@ -126,7 +125,7 @@ namespace OpenSim.Framework
public class ThreadTrackerItem
{
public System.Threading.Thread Thread;
public Thread Thread;
public long LastSeenActive;
}
}

1
OpenSim/Framework/UserConfig.cs
View File

@@ -26,7 +26,6 @@
*/
using System;
using OpenSim.Framework.Console;
namespace OpenSim.Framework
{

16
OpenSim/Framework/Util.cs
View File

@@ -26,24 +26,26 @@
*/
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using libsecondlife;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
namespace OpenSim.Framework
{
public class Util
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static Random randomClass = new Random();
private static uint nextXferID = 5000;
@@ -385,7 +387,7 @@ namespace OpenSim.Framework
/// <returns>safe path</returns>
public static string safePath(string path)
{
return System.Text.RegularExpressions.Regex.Replace(path, @regexInvalidPathChars, string.Empty);
return Regex.Replace(path, @regexInvalidPathChars, string.Empty);
}
/// <summary>
@@ -395,7 +397,7 @@ namespace OpenSim.Framework
/// <returns>safe filename</returns>
public static string safeFileName(string filename)
{
return System.Text.RegularExpressions.Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ;
return Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ;
}
//
@@ -520,7 +522,7 @@ namespace OpenSim.Framework
sr.Close();
return issue;
}
catch (System.Exception)
catch (Exception)
{
return "";
}