aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs8
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs15
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs8
-rw-r--r--OpenSim/Data/UserDataBase.cs4
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
-rw-r--r--OpenSim/Framework/IUserData.cs4
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
775 /// Database provider name 775 /// Database provider name
776 /// </summary> 776 /// </summary>
777 /// <returns>Provider name</returns> 777 /// <returns>Provider name</returns>
778 override public string getName() 778 override public string Name
779 { 779 {
780 return "MSSQL Userdata Interface"; 780 get {return "MSSQL Userdata Interface";}
781 } 781 }
782 782
783 /// <summary> 783 /// <summary>
784 /// Database provider version 784 /// Database provider version
785 /// </summary> 785 /// </summary>
786 /// <returns>provider version</returns> 786 /// <returns>provider version</returns>
787 override public string GetVersion() 787 override public string Version
788 { 788 {
789 return database.getVersion(); 789 get {return database.getVersion();}
790 } 790 }
791 791
792 /// <summary> 792 /// <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
659 /// Database provider name 659 /// Database provider name
660 /// </summary> 660 /// </summary>
661 /// <returns>Provider name</returns> 661 /// <returns>Provider name</returns>
662 override public string getName() 662 override public string Name
663 { 663 {
664 return "MySQL Userdata Interface"; 664 get {return "MySQL Userdata Interface";}
665 } 665 }
666 666
667 /// <summary> 667 /// <summary>
668 /// Database provider version 668 /// Database provider version
669 /// </summary> 669 /// </summary>
670 /// <returns>provider version</returns> 670 /// <returns>provider version</returns>
671 override public string GetVersion() 671 override public string Version
672 { 672 {
673 return "0.1"; 673 get {return "0.1";}
674 } 674 }
675 } 675 }
676} 676}
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
265 return new List<LLUUID>(); 265 return new List<LLUUID>();
266 } 266 }
267 267
268 268 public override string Name {
269 public override string getName()
270 {
271 return Name;
272 }
273
274 public string Name {
275 get { return "NHibernate"; } 269 get { return "NHibernate"; }
276 } 270 }
277 271
278 public override string GetVersion() 272 public override string Version {
279 {
280 return Version;
281 }
282
283 public string Version {
284 get { return "0.1"; } 273 get { return "0.1"; }
285 } 274 }
286 275
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
505 /// Returns the name of the storage provider 505 /// Returns the name of the storage provider
506 /// </summary> 506 /// </summary>
507 /// <returns>Storage provider name</returns> 507 /// <returns>Storage provider name</returns>
508 override public string getName() 508 override public string Name
509 { 509 {
510 return "Sqlite Userdata"; 510 get {return "Sqlite Userdata";}
511 } 511 }
512 512
513 /// <summary> 513 /// <summary>
514 /// Returns the version of the storage provider 514 /// Returns the version of the storage provider
515 /// </summary> 515 /// </summary>
516 /// <returns>Storage provider version</returns> 516 /// <returns>Storage provider version</returns>
517 override public string GetVersion() 517 override public string Version
518 { 518 {
519 return "0.1"; 519 get {return "0.1";}
520 } 520 }
521 521
522 /*********************************************************************** 522 /***********************************************************************
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
49 public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 49 public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
50 public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); 50 public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
51 public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); 51 public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
52 public abstract string GetVersion(); 52 public abstract string Version {get;}
53 public abstract string getName(); 53 public abstract string Name {get;}
54 public abstract void Initialise(); 54 public abstract void Initialise();
55 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 55 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
56 public abstract UserAppearance GetUserAppearance(LLUUID user); 56 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
81 public void AddPlugin(IUserData plug) 81 public void AddPlugin(IUserData plug)
82 { 82 {
83 plug.Initialise(); 83 plug.Initialise();
84 _plugins.Add(plug.getName(), plug); 84 _plugins.Add(plug.Name, plug);
85 m_log.Info("[USERSTORAGE]: Added IUserData Interface"); 85 m_log.Info("[USERSTORAGE]: Added IUserData Interface");
86 } 86 }
87 87
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
162 /// Returns the plugin version 162 /// Returns the plugin version
163 /// </summary> 163 /// </summary>
164 /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> 164 /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>
165 string GetVersion(); 165 string Version {get;}
166 166
167 /// <summary> 167 /// <summary>
168 /// Returns the plugin name 168 /// Returns the plugin name
169 /// </summary> 169 /// </summary>
170 /// <returns>Plugin name, eg MySQL User Provider</returns> 170 /// <returns>Plugin name, eg MySQL User Provider</returns>
171 string getName(); 171 string Name {get;}
172 172
173 /// <summary> 173 /// <summary>
174 /// Initialises the plugin (artificial constructor) 174 /// Initialises the plugin (artificial constructor)