diff options
| author | Melanie | 2012-12-18 09:48:12 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:48:12 +0000 |
| commit | 79bdf464d3f123f8e195fa57c497e546b7d9dfcc (patch) | |
| tree | bf6123b15d1ced7ec72ce871e4801d6645bb23f4 /OpenSim/Data | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix locking for good (diff) | |
| download | opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.zip opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.gz opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.bz2 opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 12c979a..01b9299 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -2028,7 +2028,7 @@ namespace OpenSim.Data.MySQL | |||
| 2028 | 2028 | ||
| 2029 | using (MySqlCommand cmd = dbcon.CreateCommand()) | 2029 | using (MySqlCommand cmd = dbcon.CreateCommand()) |
| 2030 | { | 2030 | { |
| 2031 | cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID"; | 2031 | cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID and SceneGroupID = UUID"; |
| 2032 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); | 2032 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); |
| 2033 | 2033 | ||
| 2034 | using (IDataReader reader = ExecuteReader(cmd)) | 2034 | using (IDataReader reader = ExecuteReader(cmd)) |