avinationmerge
Melanie 2012-06-07 23:41:00 +02:00
parent 26c5b32988
commit b700f58d5e
1 changed files with 5 additions and 3 deletions

View File

@ -119,8 +119,10 @@ namespace OpenSim.Data.MySQL
// Eligibility check // Eligibility check
// //
if ((flags & (uint)PrimFlags.Temporary) != 0) // PrimFlags.Temporary is not used in OpenSim code and cannot
return; // be guaranteed to always be clear. Don't check it.
// if ((flags & (uint)PrimFlags.Temporary) != 0)
// return;
if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0) if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
return; return;
@ -1923,7 +1925,7 @@ namespace OpenSim.Data.MySQL
using (MySqlCommand cmd = dbcon.CreateCommand()) using (MySqlCommand cmd = dbcon.CreateCommand())
{ {
cmd.CommandText = "select UUID prom prims where RegionUUID = ?RegionUUID"; cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID";
cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
using (IDataReader reader = ExecuteReader(cmd)) using (IDataReader reader = ExecuteReader(cmd))