aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie2010-08-26 00:11:07 +0100
committerMelanie2010-08-26 00:11:07 +0100
commitfc8d2be632c754338b136fe4a3d57c40b0190ce7 (patch)
tree94bb954bdf258e968e8c337ad1da57ba9fa68b91 /OpenSim/Data/MySQL
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-fc8d2be632c754338b136fe4a3d57c40b0190ce7.zip
opensim-SC_OLD-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.gz
opensim-SC_OLD-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.bz2
opensim-SC_OLD-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.xz
Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 1edcb5d..37d7a88 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -239,6 +239,7 @@ namespace OpenSim.Data.MySQL
239 239
240 ExecuteNonQuery(cmd); 240 ExecuteNonQuery(cmd);
241 } 241 }
242
242 cmd.Dispose(); 243 cmd.Dispose();
243 } 244 }
244 } 245 }