aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJeff Ames2008-08-19 02:59:27 +0000
committerJeff Ames2008-08-19 02:59:27 +0000
commitbea7d4d81ad7a75706305be6c8ca06f8dc6e6eca (patch)
tree6350036021802eadb2540d14461eb545afd7dea6 /OpenSim/Data
parentAttachment persistence!!! Patch #9169 (Mantis #1171) (diff)
downloadopensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.zip
opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.gz
opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.bz2
opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs6
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index b857aad..c9a0498 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -668,7 +668,7 @@ namespace OpenSim.Data.MySQL
668 while (r.Read()) 668 while (r.Read())
669 { 669 {
670 int attachpoint = Convert.ToInt32(r["attachpoint"]); 670 int attachpoint = Convert.ToInt32(r["attachpoint"]);
671 if(ret.ContainsKey(attachpoint)) 671 if (ret.ContainsKey(attachpoint))
672 continue; 672 continue;
673 Hashtable item = new Hashtable(); 673 Hashtable item = new Hashtable();
674 item.Add("item", r["item"].ToString()); 674 item.Add("item", r["item"].ToString());
@@ -676,7 +676,7 @@ namespace OpenSim.Data.MySQL
676 676
677 ret.Add(attachpoint, item); 677 ret.Add(attachpoint, item);
678 } 678 }
679 679
680 r.Close(); 680 r.Close();
681 681
682 return ret; 682 return ret;
@@ -1205,7 +1205,7 @@ namespace OpenSim.Data.MySQL
1205 MySqlCommand cmd = (MySqlCommand) dbcon.CreateCommand(); 1205 MySqlCommand cmd = (MySqlCommand) dbcon.CreateCommand();
1206 cmd.CommandText = sql; 1206 cmd.CommandText = sql;
1207 cmd.Parameters.AddWithValue("?uuid", agentID.ToString()); 1207 cmd.Parameters.AddWithValue("?uuid", agentID.ToString());
1208 1208
1209 cmd.ExecuteNonQuery(); 1209 cmd.ExecuteNonQuery();
1210 1210
1211 if (data == null) 1211 if (data == null)
@@ -1216,7 +1216,7 @@ namespace OpenSim.Data.MySQL
1216 cmd = (MySqlCommand) dbcon.CreateCommand(); 1216 cmd = (MySqlCommand) dbcon.CreateCommand();
1217 cmd.CommandText = sql; 1217 cmd.CommandText = sql;
1218 1218
1219 foreach(DictionaryEntry e in data) 1219 foreach (DictionaryEntry e in data)
1220 { 1220 {
1221 int attachpoint = Convert.ToInt32(e.Key); 1221 int attachpoint = Convert.ToInt32(e.Key);
1222 1222
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 82ca5b1..9a056b2 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Data.MySQL
57 private string m_appearanceTableName = "avatarappearance"; 57 private string m_appearanceTableName = "avatarappearance";
58 private string m_connectString; 58 private string m_connectString;
59 59
60 public override void Initialise() 60 public override void Initialise()
61 { 61 {
62 m_log.Info("[MySQLUserData]: " + Name + " cannot be default-initialized!"); 62 m_log.Info("[MySQLUserData]: " + Name + " cannot be default-initialized!");
63 throw new PluginNotInitialisedException (Name); 63 throw new PluginNotInitialisedException (Name);
64 } 64 }
@@ -409,7 +409,7 @@ namespace OpenSim.Data.MySQL
409 409
410 Lfli.Add(fli); 410 Lfli.Add(fli);
411 } 411 }
412 412
413 reader.Dispose(); 413 reader.Dispose();
414 result.Dispose(); 414 result.Dispose();
415 } 415 }