aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorubit2012-12-11 23:55:34 +0100
committerubit2012-12-11 23:55:34 +0100
commit7d2dad0ffa932eedd81b6a8eea0b764ece93d8c9 (patch)
tree86ad8985889778db9f0c99c09c2af3962f7faacd /OpenSim/Data
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentmake ubitODE ignore X and Y rotation components on avatar rotations (diff)
downloadopensim-SC-7d2dad0ffa932eedd81b6a8eea0b764ece93d8c9.zip
opensim-SC-7d2dad0ffa932eedd81b6a8eea0b764ece93d8c9.tar.gz
opensim-SC-7d2dad0ffa932eedd81b6a8eea0b764ece93d8c9.tar.bz2
opensim-SC-7d2dad0ffa932eedd81b6a8eea0b764ece93d8c9.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs2
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))