OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.0-stable
Adam Frisby 2008-04-21 07:09:17 +00:00
parent 05e24c8f58
commit fef3b36894
306 changed files with 1011 additions and 1306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -25,9 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Reflection;
using System.Threading;
using log4net;
using Mono.Addins;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.RegionLoader.Filesystem;
using OpenSim.Framework.RegionLoader.Web;
@ -39,7 +41,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
[Extension("/OpenSim/Startup")]
public class LoadRegionsPlugin : IApplicationPlugin
{
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 void Initialise(OpenSimMain openSim)
{
@ -64,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
for (int i = 0; i < regionsToLoad.Length; i++)
{
m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
openSim.CreateRegion(regionsToLoad[i], true);
}
@ -94,7 +96,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
{
if (regionhandle == regionsToLoad[i].RegionHandle)
{
m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
openSim.CreateRegion(regionsToLoad[i], true);
}
}

7
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -27,14 +27,15 @@
using System;
using System.Collections;
using System.Net;
using System.IO;
using System.Net;
using System.Reflection;
using System.Timers;
using libsecondlife;
using log4net;
using Mono.Addins;
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Scenes;
@ -46,7 +47,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
[Extension("/OpenSim/Startup")]
public class RemoteAdminPlugin : IApplicationPlugin
{
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 OpenSimMain m_app;
private BaseHttpServer m_httpd;

3
OpenSim/Data/AssetDataBase.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;
using OpenSim.Framework;

2
OpenSim/Data/Base/BaseRowMapper.cs
View File

@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenSim.Data.Base;
namespace OpenSim.Data.Base
{
public abstract class BaseRowMapper

1
OpenSim/Data/Base/BaseSchema.cs
View File

@ -26,7 +26,6 @@
*/
using System.Collections.Generic;
using OpenSim.Data.Base;
namespace OpenSim.Data.Base
{

1
OpenSim/Data/Base/BaseTableMapper.cs
View File

@ -28,7 +28,6 @@
using System;
using System.Data;
using System.Data.Common;
using OpenSim.Data.Base;
namespace OpenSim.Data.Base
{

4
OpenSim/Data/DB4o/DB4oUserData.cs
View File

@ -174,10 +174,10 @@ namespace OpenSim.Data.DB4o
public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
//Do nothing yet
List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
return returnlist;
}

4
OpenSim/Data/DataStoreBase.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.Data
{
public abstract class DataStoreBase

3
OpenSim/Data/GridDataBase.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.Data

1
OpenSim/Data/IGridData.cs
View File

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

4
OpenSim/Data/InventoryDataBase.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.Data
{
public abstract class InventoryDataBase

5
OpenSim/Data/MSSQL/MSSQLAssetData.cs
View File

@ -29,15 +29,16 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MSSQL
{
internal class MSSQLAssetData : AssetDataBase
{
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 MSSQLManager database;

7
OpenSim/Data/MSSQL/MSSQLDataStore.cs
View File

@ -30,20 +30,19 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Data;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Data.MSSQL;
namespace OpenSim.Data.MSSQL
{
public class MSSQLDataStore : IRegionDataStore
{
// private static FileSystemDataStore Instance = new FileSystemDataStore();
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 const string m_primSelect = "select * from prims";
private const string m_shapeSelect = "select * from primshapes";

5
OpenSim/Data/MSSQL/MSSQLGridData.cs
View File

@ -28,10 +28,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Data.MSSQL
{
@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
/// </summary>
public class MSSQLGridData : GridDataBase
{
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>
/// Database manager

5
OpenSim/Data/MSSQL/MSSQLInventoryData.cs
View File

@ -29,9 +29,10 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MSSQL
{
@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
/// </summary>
public class MSSQLInventoryData : IInventoryData
{
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 database manager

4
OpenSim/Data/MSSQL/MSSQLManager.cs
View File

@ -32,8 +32,8 @@ using System.Data.SqlClient;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MSSQL
{
@ -42,7 +42,7 @@ namespace OpenSim.Data.MSSQL
/// </summary>
public class MSSQLManager
{
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 database connection object

13
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@ -29,9 +29,10 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MSSQL
{
@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
/// </summary>
public class MSSQLUserData : UserDataBase
{
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>
/// Database manager for MySQL
@ -326,9 +327,9 @@ namespace OpenSim.Data.MSSQL
override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
string[] querysplit;
querysplit = query.Split(' ');
if (querysplit.Length == 2)
@ -350,7 +351,7 @@ namespace OpenSim.Data.MSSQL
while (reader.Read())
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
AvatarPickerAvatar user = new AvatarPickerAvatar();
user.AvatarID = new LLUUID((string)reader["UUID"]);
user.firstName = (string)reader["username"];
user.lastName = (string)reader["lastname"];
@ -385,7 +386,7 @@ namespace OpenSim.Data.MSSQL
while (reader.Read())
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
AvatarPickerAvatar user = new AvatarPickerAvatar();
user.AvatarID = new LLUUID((string)reader["UUID"]);
user.firstName = (string)reader["username"];
user.lastName = (string)reader["lastname"];

1
OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
View File

@ -28,7 +28,6 @@
using System;
using System.Data.Common;
using System.Data.SqlClient;
using OpenSim.Data;
namespace OpenSim.Data.MSSQLMapper
{

5
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

@ -28,16 +28,17 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using libsecondlife;
using log4net;
using MySql.Data.MySqlClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MySQL
{
internal class MySQLAssetData : AssetDataBase, IPlugin
{
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 MySQLManager _dbConnection;

9
OpenSim/Data/MySQL/MySQLDataStore.cs
View File

@ -28,12 +28,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Threading;
using libsecondlife;
using log4net;
using MySql.Data.MySqlClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
@ -41,7 +42,7 @@ namespace OpenSim.Data.MySQL
{
public class MySQLDataStore : IRegionDataStore
{
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 const string m_primSelect = "select * from prims";
private const string m_shapeSelect = "select * from primshapes";
@ -1498,7 +1499,7 @@ namespace OpenSim.Data.MySQL
{
m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message);
m_log.Error("[MySql]: Application is terminating!");
System.Threading.Thread.CurrentThread.Abort();
Thread.CurrentThread.Abort();
}
}

6
OpenSim/Data/MySQL/MySQLGridData.cs
View File

@ -28,11 +28,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using libsecondlife;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Data.MySQL
{
@ -41,7 +41,7 @@ namespace OpenSim.Data.MySQL
/// </summary>
public class MySQLGridData : GridDataBase
{
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>
/// MySQL Database Manager

7
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@ -27,10 +27,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using log4net;
using MySql.Data.MySqlClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MySQL
{
@ -39,8 +40,8 @@ namespace OpenSim.Data.MySQL
/// </summary>
public class MySQLInventoryData : IInventoryData
{
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 database manager

5
OpenSim/Data/MySQL/MySQLManager.cs
View File

@ -28,13 +28,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using MySql.Data.MySqlClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MySQL
{
@ -43,7 +42,7 @@ namespace OpenSim.Data.MySQL
/// </summary>
internal class MySQLManager
{
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 database connection object

13
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -28,10 +28,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Text.RegularExpressions;
using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.MySQL
{
@ -40,7 +41,7 @@ namespace OpenSim.Data.MySQL
/// </summary>
internal class MySQLUserData : UserDataBase
{
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>
/// Database manager for MySQL
@ -348,9 +349,9 @@ namespace OpenSim.Data.MySQL
m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
}
override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
@ -373,7 +374,7 @@ namespace OpenSim.Data.MySQL
while (reader.Read())
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
AvatarPickerAvatar user = new AvatarPickerAvatar();
user.AvatarID = new LLUUID((string) reader["UUID"]);
user.firstName = (string) reader["username"];
user.lastName = (string) reader["lastname"];
@ -407,7 +408,7 @@ namespace OpenSim.Data.MySQL
while (reader.Read())
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
AvatarPickerAvatar user = new AvatarPickerAvatar();
user.AvatarID = new LLUUID((string) reader["UUID"]);
user.firstName = (string) reader["username"];
user.lastName = (string) reader["lastname"];

4
OpenSim/Data/MySQLMapper/MySQLDataReader.cs
View File

@ -25,11 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using OpenSim.Data.Base;
namespace OpenSim.Data.MySQLMapper
{

1
OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
View File

@ -28,7 +28,6 @@
using System.Data;
using System.Data.Common;
using MySql.Data.MySqlClient;
using OpenSim.Data;
using OpenSim.Data.Base;
namespace OpenSim.Data.MySQLMapper

12
OpenSim/Data/NHibernate/NHibernateAssetData.cs
View File

@ -26,16 +26,14 @@
*/
using System;
using System.Data;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using NHibernate;
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
using NHibernate.Mapping.Attributes;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
@ -45,7 +43,7 @@ namespace OpenSim.Data.NHibernate
/// </summary>
public class NHibernateAssetData : AssetDataBase, IDisposable
{
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 Configuration cfg;
private ISessionFactory factory;
@ -67,8 +65,8 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true;
using ( System.IO.MemoryStream stream =
HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
using ( MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
cfg.AddInputStream(stream);
// new SchemaExport(cfg).Create(true, true);

16
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

@ -26,25 +26,23 @@
*/
using System;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using NHibernate;
using NHibernate.Expression;
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
using NHibernate.Expression;
using NHibernate.Mapping.Attributes;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{
public class NHibernateInventoryData: IInventoryData
{
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 Configuration cfg;
private ISessionFactory factory;
@ -74,8 +72,8 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true;
using ( System.IO.MemoryStream stream =
HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
using ( MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
cfg.AddInputStream(stream);
// new SchemaExport(cfg).Create(true, true);

9
OpenSim/Data/NHibernate/NHibernateManager.cs
View File

@ -25,18 +25,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Data;
using libsecondlife;
using System.Reflection;
using log4net;
using NHibernate;
using NHibernate.Cfg;
namespace OpenSim.Data.NHibernate
{
internal class NHibernateManager
{
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 ISessionFactory factory;
private ISession session;

16
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -25,20 +25,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using NHibernate;
using NHibernate.Cfg;
using NHibernate.Expression;
using NHibernate.Tool.hbm2ddl;
using NHibernate.Mapping.Attributes;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using Environment = NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{
@ -47,7 +43,7 @@ namespace OpenSim.Data.NHibernate
/// </summary>
public class NHibernateUserData : UserDataBase
{
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 Configuration cfg;
private ISessionFactory factory;
@ -69,8 +65,8 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true;
using ( System.IO.MemoryStream stream =
HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
using ( MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
cfg.AddInputStream(stream);
// new SchemaExport(cfg).Create(true, true);

6
OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
View File

@ -27,10 +27,10 @@
using System;
using System.Data;
using libsecondlife;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using libsecondlife;
namespace OpenSim.Data.NHibernate
{
@ -67,7 +67,7 @@ namespace OpenSim.Data.NHibernate
get { return false; }
}
public object NullSafeGet(System.Data.IDataReader rs, string[] names, object owner)
public object NullSafeGet(IDataReader rs, string[] names, object owner)
{
object uuid = null;
@ -81,7 +81,7 @@ namespace OpenSim.Data.NHibernate
return uuid;
}
public void NullSafeSet(System.Data.IDbCommand cmd, object obj, int index)
public void NullSafeSet(IDbCommand cmd, object obj, int index)
{
LLUUID uuid = (LLUUID)obj;
((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();

1
OpenSim/Data/OpenSimDataReader.cs
View File

@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Data;
using libsecondlife;
using OpenSim.Data.Base;

2
OpenSim/Data/OpenSimDatabaseConnector.cs
View File

@ -26,9 +26,7 @@
*/
using System.Data;
using System.Data.Common;
using libsecondlife;
using OpenSim.Data.Base;
namespace OpenSim.Data

2
OpenSim/Data/OpenSimObjectFieldMapper.cs
View File

@ -28,9 +28,7 @@
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Text;
using libsecondlife;
using OpenSim.Data.Base;
namespace OpenSim.Data

2
OpenSim/Data/OpenSimTableMapper.cs
View File

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

4
OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
View File

@ -26,9 +26,9 @@
*/
using System;
using OpenSim.Framework;
using OpenSim.Data.Base;
using libsecondlife;
using OpenSim.Data.Base;
using OpenSim.Framework;
namespace OpenSim.Data
{

9
OpenSim/Data/ReservationData.cs
View File

@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using libsecondlife;
namespace OpenSim.Data
@ -37,11 +38,11 @@ namespace OpenSim.Data
public int reservationMaxX = 65536;
public int reservationMaxY = 65536;
public string reservationName = System.String.Empty;
public string reservationCompany = System.String.Empty;
public string reservationName = String.Empty;
public string reservationCompany = String.Empty;
public bool status = true;
public string gridSendKey = System.String.Empty;
public string gridRecvKey = System.String.Empty;
public string gridSendKey = String.Empty;
public string gridRecvKey = String.Empty;
}
}

4
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@ -29,9 +29,9 @@ using System;
using System.Data;
using System.Reflection;
using libsecondlife;
using log4net;
using Mono.Data.SqliteClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.SQLite
{
@ -40,7 +40,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
public class SQLiteAssetData : AssetDataBase
{
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 database manager

4
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@ -30,15 +30,15 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using libsecondlife;
using log4net;
using Mono.Data.SqliteClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.SQLite
{
public class SQLiteInventoryStore : SQLiteUtil, IInventoryData
{
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 const string invItemsSelect = "select * from inventoryitems";
private const string invFoldersSelect = "select * from inventoryfolders";

6
OpenSim/Data/SQLite/SQLiteManager.cs
View File

@ -29,15 +29,15 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SQLite;
using System.Reflection;
using libsecondlife;
using Mono.Data.SqliteClient;
using OpenSim.Framework.Console;
using log4net;
namespace OpenSim.Data.SQLite
{
internal class SQLiteManager : SQLiteUtil
{
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 IDbConnection dbcon;

5
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -29,10 +29,11 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Reflection;
using libsecondlife;
using log4net;
using Mono.Data.SqliteClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
{
public class SQLiteRegionData : IRegionDataStore
{
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 const string primSelect = "select * from prims";
private const string shapeSelect = "select * from primshapes";

17
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -28,10 +28,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using libsecondlife;
using log4net;
using Mono.Data.SqliteClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Data.SQLite
{
@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
public class SQLiteUserData : UserDataBase
{
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 database manager
@ -238,9 +239,9 @@ namespace OpenSim.Data.SQLite
}
override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
string[] querysplit;
querysplit = query.Split(' ');
if (querysplit.Length == 2)
@ -254,7 +255,7 @@ namespace OpenSim.Data.SQLite
{
while (reader.Read())
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
AvatarPickerAvatar user = new AvatarPickerAvatar();
user.AvatarID = new LLUUID((string) reader["UUID"]);
user.firstName = (string) reader["username"];
user.lastName = (string) reader["surname"];
@ -275,7 +276,7 @@ namespace OpenSim.Data.SQLite
{
while (reader.Read())
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
AvatarPickerAvatar user = new AvatarPickerAvatar();
user.AvatarID = new LLUUID((string) reader["UUID"]);
user.firstName = (string) reader["username"];
user.lastName = (string) reader["surname"];
@ -766,7 +767,7 @@ namespace OpenSim.Data.SQLite
pcmd.ExecuteNonQuery();
}
catch (System.Exception)
catch (Exception)
{
m_log.Info("[USERS]: users table already exists");
}
@ -775,7 +776,7 @@ namespace OpenSim.Data.SQLite
{
fcmd.ExecuteNonQuery();
}
catch (System.Exception)
catch (Exception)
{
m_log.Info("[USERS]: userfriends table already exists");
}

2
OpenSim/Data/UserDataBase.cs
View File

@ -52,6 +52,6 @@ namespace OpenSim.Data
public abstract string GetVersion();
public abstract string getName();
public abstract void Initialise();
public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
}
}

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
{

Some files were not shown because too many files have changed in this diff Show More