aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLUserData.cs
diff options
context:
space:
mode:
authorMike Mazur2008-07-31 09:24:28 +0000
committerMike Mazur2008-07-31 09:24:28 +0000
commit2270b252656146d9d74b84665a7ace6c3139db30 (patch)
tree7a967ee50349cf4301ed801e0b8c85f5060ffe1d /OpenSim/Data/MySQL/MySQLUserData.cs
parentdropping intermediate GridInfoPlugin.addin.xml, as it's no longer (diff)
downloadopensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.zip
opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.tar.gz
opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.tar.bz2
opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.tar.xz
Thanks, sempuki, for a patch that moves all Grid Server's plugins to
PluginLoader. Fix issue 1871.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs23
1 files changed, 16 insertions, 7 deletions
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
55 private string m_appearanceTableName = "avatarappearance"; 55 private string m_appearanceTableName = "avatarappearance";
56 private string m_connectString; 56 private string m_connectString;
57 57
58 public override void Initialise()
59 {
60 m_log.Info("[MySQLUserData]: " + Name + " cannot be default-initialized!");
61 throw new PluginNotInitialisedException (Name);
62 }
63
58 /// <summary> 64 /// <summary>
59 /// Initialise User Interface 65 /// Initialise User Interface
60 /// Loads and initialises the MySQL storage plugin 66 /// Loads and initialises the MySQL storage plugin
@@ -120,6 +126,9 @@ namespace OpenSim.Data.MySQL
120 m.Update(); 126 m.Update();
121 } 127 }
122 128
129 public override void Dispose () { }
130
131
123 #region Test and initialization code 132 #region Test and initialization code
124 133
125 /// <summary> 134 /// <summary>
@@ -252,7 +261,7 @@ namespace OpenSim.Data.MySQL
252 261
253 UserProfileData row = database.readUserRow(reader); 262 UserProfileData row = database.readUserRow(reader);
254 263
255 reader.Close(); 264 reader.Dispose();
256 result.Dispose(); 265 result.Dispose();
257 return row; 266 return row;
258 } 267 }
@@ -398,7 +407,7 @@ namespace OpenSim.Data.MySQL
398 407
399 Lfli.Add(fli); 408 Lfli.Add(fli);
400 } 409 }
401 reader.Close(); 410 reader.Dispose();
402 result.Dispose(); 411 result.Dispose();
403 } 412 }
404 } 413 }
@@ -450,7 +459,7 @@ namespace OpenSim.Data.MySQL
450 user.lastName = (string) reader["lastname"]; 459 user.lastName = (string) reader["lastname"];
451 returnlist.Add(user); 460 returnlist.Add(user);
452 } 461 }
453 reader.Close(); 462 reader.Dispose();
454 result.Dispose(); 463 result.Dispose();
455 } 464 }
456 } 465 }
@@ -484,7 +493,7 @@ namespace OpenSim.Data.MySQL
484 user.lastName = (string) reader["lastname"]; 493 user.lastName = (string) reader["lastname"];
485 returnlist.Add(user); 494 returnlist.Add(user);
486 } 495 }
487 reader.Close(); 496 reader.Dispose();
488 result.Dispose(); 497 result.Dispose();
489 } 498 }
490 } 499 }
@@ -517,7 +526,7 @@ namespace OpenSim.Data.MySQL
517 526
518 UserProfileData row = database.readUserRow(reader); 527 UserProfileData row = database.readUserRow(reader);
519 528
520 reader.Close(); 529 reader.Dispose();
521 result.Dispose(); 530 result.Dispose();
522 531
523 return row; 532 return row;
@@ -603,7 +612,7 @@ namespace OpenSim.Data.MySQL
603 612
604 UserAgentData row = database.readAgentRow(reader); 613 UserAgentData row = database.readAgentRow(reader);
605 614
606 reader.Close(); 615 reader.Dispose();
607 result.Dispose(); 616 result.Dispose();
608 617
609 return row; 618 return row;
@@ -725,7 +734,7 @@ namespace OpenSim.Data.MySQL
725 734
726 AvatarAppearance appearance = database.readAppearanceRow(reader); 735 AvatarAppearance appearance = database.readAppearanceRow(reader);
727 736
728 reader.Close(); 737 reader.Dispose();
729 result.Dispose(); 738 result.Dispose();
730 739
731 return appearance; 740 return appearance;