aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs37
1 files changed, 35 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index faf749f..4e7c8af 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -119,8 +119,10 @@ namespace OpenSim.Data.MySQL
119 119
120 // Eligibility check 120 // Eligibility check
121 // 121 //
122 if ((flags & (uint)PrimFlags.Temporary) != 0) 122 // PrimFlags.Temporary is not used in OpenSim code and cannot
123 return; 123 // be guaranteed to always be clear. Don't check it.
124// if ((flags & (uint)PrimFlags.Temporary) != 0)
125// return;
124 if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0) 126 if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
125 return; 127 return;
126 128
@@ -1972,6 +1974,37 @@ namespace OpenSim.Data.MySQL
1972 } 1974 }
1973 } 1975 }
1974 1976
1977 public UUID[] GetObjectIDs(UUID regionID)
1978 {
1979 List<UUID> uuids = new List<UUID>();
1980
1981 lock (m_dbLock)
1982 {
1983 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
1984 {
1985 dbcon.Open();
1986
1987 using (MySqlCommand cmd = dbcon.CreateCommand())
1988 {
1989 cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID";
1990 cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
1991
1992 using (IDataReader reader = ExecuteReader(cmd))
1993 {
1994 while (reader.Read())
1995 {
1996 UUID id = new UUID(reader["UUID"].ToString());
1997
1998 uuids.Add(id);
1999 }
2000 }
2001 }
2002 }
2003 }
2004
2005 return uuids.ToArray();
2006 }
2007
1975 private void LoadSpawnPoints(RegionSettings rs) 2008 private void LoadSpawnPoints(RegionSettings rs)
1976 { 2009 {
1977 rs.ClearSpawnPoints(); 2010 rs.ClearSpawnPoints();