7 files changed, 19 insertions, 30 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 91c1b34..a4c5068 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -775,18 +775,18 @@ namespace OpenSim.Data.MSSQL
         /// Database provider name
         /// </summary>
         /// <returns>Provider name</returns>
-        override public string getName()
+        override public string Name
         {
-            return "MSSQL Userdata Interface";
+            get {return "MSSQL Userdata Interface";}
         }
 
         /// <summary>
         /// Database provider version
         /// </summary>
         /// <returns>provider version</returns>
-        override public string GetVersion()
+        override public string Version
         {
-            return database.getVersion();
+            get {return database.getVersion();}
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index a01bf60..c374bf2 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -659,18 +659,18 @@ namespace OpenSim.Data.MySQL
         /// Database provider name
         /// </summary>
         /// <returns>Provider name</returns>
-        override public string getName()
+        override public string Name
         {
-            return "MySQL Userdata Interface";
+            get {return "MySQL Userdata Interface";}
         }
 
         /// <summary>
         /// Database provider version
         /// </summary>
         /// <returns>provider version</returns>
-        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 f142ce9..2e55e03 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -265,22 +265,11 @@ namespace OpenSim.Data.NHibernate
             return new List<LLUUID>();
         }
 
-
-        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 90dec3e..bca5401 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
         /// </summary>
         /// <returns>Storage provider name</returns>
-        override public string getName()
+        override public string Name
         {
-            return "Sqlite Userdata";
+            get {return "Sqlite Userdata";}
         }
 
         /// <summary>
         /// Returns the version of the storage provider
         /// </summary>
         /// <returns>Storage provider version</returns>
-        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 84ff9b3..fc33376 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Data
         public abstract List<FriendListItem> 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<AvatarPickerAvatar> 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 0a877f6..29bfe22 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 cd29816..b75a229 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -162,13 +162,13 @@ namespace OpenSim.Framework
         /// Returns the plugin version
         /// </summary>
         /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>
-        string GetVersion();
+        string Version {get;}
 
         /// <summary>
         /// Returns the plugin name
         /// </summary>
         /// <returns>Plugin name, eg MySQL User Provider</returns>
-        string getName();
+        string Name {get;}
 
         /// <summary>
         /// Initialises the plugin (artificial constructor)