diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 91c1b3464c..a4c5068401 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -775,18 +775,18 @@ namespace OpenSim.Data.MSSQL
/// Database provider name
///
/// Provider name
- override public string getName()
+ override public string Name
{
- return "MSSQL Userdata Interface";
+ get {return "MSSQL Userdata Interface";}
}
///
/// Database provider version
///
/// provider version
- override public string GetVersion()
+ override public string Version
{
- return database.getVersion();
+ get {return database.getVersion();}
}
///
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index a01bf60d42..c374bf2e07 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -659,18 +659,18 @@ namespace OpenSim.Data.MySQL
/// Database provider name
///
/// Provider name
- override public string getName()
+ override public string Name
{
- return "MySQL Userdata Interface";
+ get {return "MySQL Userdata Interface";}
}
///
/// Database provider version
///
/// provider version
- override public string GetVersion()
+ override public string Version
{
- return "0.1";
+ get {return "0.1";}
}
}
}
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index f142ce910d..2e55e03c05 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -265,22 +265,11 @@ namespace OpenSim.Data.NHibernate
return new List();
}
-
- public override string getName()
- {
- return Name;
- }
-
- public string Name {
+ public override string Name {
get { return "NHibernate"; }
}
- public override string GetVersion()
- {
- return Version;
- }
-
- public string Version {
+ public override string Version {
get { return "0.1"; }
}
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 90dec3e2f9..bca54011c9 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -505,18 +505,18 @@ namespace OpenSim.Data.SQLite
/// Returns the name of the storage provider
///
/// Storage provider name
- override public string getName()
+ override public string Name
{
- return "Sqlite Userdata";
+ get {return "Sqlite Userdata";}
}
///
/// Returns the version of the storage provider
///
/// Storage provider version
- override public string GetVersion()
+ override public string Version
{
- return "0.1";
+ get {return "0.1";}
}
/***********************************************************************
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 84ff9b3ebf..fc33376447 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Data
public abstract List GetUserFriendList(LLUUID friendlistowner);
public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
- public abstract string GetVersion();
- public abstract string getName();
+ public abstract string Version {get;}
+ public abstract string Name {get;}
public abstract void Initialise();
public abstract List GeneratePickerResults(LLUUID queryID, string query);
public abstract UserAppearance GetUserAppearance(LLUUID user);
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0a877f6ee0..29bfe22841 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Communications
public void AddPlugin(IUserData plug)
{
plug.Initialise();
- _plugins.Add(plug.getName(), plug);
+ _plugins.Add(plug.Name, plug);
m_log.Info("[USERSTORAGE]: Added IUserData Interface");
}
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index cd29816c55..b75a229628 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -162,13 +162,13 @@ namespace OpenSim.Framework
/// Returns the plugin version
///
/// Plugin version in MAJOR.MINOR.REVISION.BUILD format
- string GetVersion();
+ string Version {get;}
///
/// Returns the plugin name
///
/// Plugin name, eg MySQL User Provider
- string getName();
+ string Name {get;}
///
/// Initialises the plugin (artificial constructor)