From 2270b252656146d9d74b84665a7ace6c3139db30 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Thu, 31 Jul 2008 09:24:28 +0000
Subject: Thanks, sempuki, for a patch that moves all Grid Server's plugins to
 PluginLoader. Fix issue 1871.

---
 OpenSim/Data/MySQL/MySQLUserData.cs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Data/MySQL/MySQLUserData.cs')

diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 11d9c26..d8830de 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -55,6 +55,12 @@ namespace OpenSim.Data.MySQL
         private string m_appearanceTableName = "avatarappearance";
         private string m_connectString;
 
+        public override void Initialise() 
+        { 
+            m_log.Info("[MySQLUserData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException (Name);
+        }
+
         /// <summary>
         /// Initialise User Interface
         /// Loads and initialises the MySQL storage plugin
@@ -120,6 +126,9 @@ namespace OpenSim.Data.MySQL
             m.Update();
         }
 
+        public override void Dispose () { }
+
+
         #region Test and initialization code
 
         /// <summary>
@@ -252,7 +261,7 @@ namespace OpenSim.Data.MySQL
 
                     UserProfileData row = database.readUserRow(reader);
 
-                    reader.Close();
+                    reader.Dispose();
                     result.Dispose();
                     return row;
                 }
@@ -398,7 +407,7 @@ namespace OpenSim.Data.MySQL
 
                         Lfli.Add(fli);
                     }
-                    reader.Close();
+                    reader.Dispose();
                     result.Dispose();
                 }
             }
@@ -450,7 +459,7 @@ namespace OpenSim.Data.MySQL
                             user.lastName = (string) reader["lastname"];
                             returnlist.Add(user);
                         }
-                        reader.Close();
+                        reader.Dispose();
                         result.Dispose();
                     }
                 }
@@ -484,7 +493,7 @@ namespace OpenSim.Data.MySQL
                             user.lastName = (string) reader["lastname"];
                             returnlist.Add(user);
                         }
-                        reader.Close();
+                        reader.Dispose();
                         result.Dispose();
                     }
                 }
@@ -517,7 +526,7 @@ namespace OpenSim.Data.MySQL
 
                     UserProfileData row = database.readUserRow(reader);
 
-                    reader.Close();
+                    reader.Dispose();
                     result.Dispose();
 
                     return row;
@@ -603,7 +612,7 @@ namespace OpenSim.Data.MySQL
 
                     UserAgentData row = database.readAgentRow(reader);
 
-                    reader.Close();
+                    reader.Dispose();
                     result.Dispose();
 
                     return row;
@@ -725,7 +734,7 @@ namespace OpenSim.Data.MySQL
 
                     AvatarAppearance appearance = database.readAppearanceRow(reader);
 
-                    reader.Close();
+                    reader.Dispose();
                     result.Dispose();
 
                     return appearance;
-- 
cgit v1.1