diff options
| author | Melanie | 2012-04-30 19:04:38 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-30 19:04:38 +0100 |
| commit | 4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch) | |
| tree | 4a1a8386e77f584c900229f1e8ddb08058d07697 /OpenSim/Data/MySQL/MySQLRegionData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff) | |
| download | opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2 opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLRegionData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index d1f1932..0614879 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
| @@ -329,11 +329,12 @@ namespace OpenSim.Data.MySQL | |||
| 329 | if (scopeID != UUID.Zero) | 329 | if (scopeID != UUID.Zero) |
| 330 | command += " and ScopeID = ?scopeID"; | 330 | command += " and ScopeID = ?scopeID"; |
| 331 | 331 | ||
| 332 | MySqlCommand cmd = new MySqlCommand(command); | 332 | using (MySqlCommand cmd = new MySqlCommand(command)) |
| 333 | 333 | { | |
| 334 | cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString()); | 334 | cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString()); |
| 335 | 335 | ||
| 336 | return RunCommand(cmd); | 336 | return RunCommand(cmd); |
| 337 | } | ||
| 337 | } | 338 | } |
| 338 | } | 339 | } |
| 339 | } | 340 | } \ No newline at end of file |