aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2012-12-11 18:02:01 +0000
committerUbitUmarov2012-12-11 18:02:01 +0000
commit04baea2d711f9f04227160fdb8c89b6215eb884e (patch)
tree8db5b694b4fa30496cbb02675885cddfb405ed3a
parent fix let other phys plugins work.. broken when added feetOffset (diff)
parentCheck database for root prim IDs only to try and get a handle on prim loss (diff)
downloadopensim-SC-04baea2d711f9f04227160fdb8c89b6215eb884e.zip
opensim-SC-04baea2d711f9f04227160fdb8c89b6215eb884e.tar.gz
opensim-SC-04baea2d711f9f04227160fdb8c89b6215eb884e.tar.bz2
opensim-SC-04baea2d711f9f04227160fdb8c89b6215eb884e.tar.xz
Merge branch 'avination' into ubitwork
-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))