Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-16 10:52:56 +01:00
14 changed files with 280 additions and 180 deletions

View File

@@ -424,6 +424,7 @@ namespace OpenSim.Data.MySQL
cmd.CommandText =
"SELECT * FROM prims LEFT JOIN primshapes ON prims.UUID = primshapes.UUID WHERE RegionUUID = ?RegionUUID";
cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
cmd.CommandTimeout = 3600;
using (IDataReader reader = ExecuteReader(cmd))
{