diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index ec7a454..1999d89 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 | ||
@@ -1911,6 +1913,37 @@ namespace OpenSim.Data.MySQL | |||
1911 | } | 1913 | } |
1912 | } | 1914 | } |
1913 | 1915 | ||
1916 | public UUID[] GetObjectIDs(UUID regionID) | ||
1917 | { | ||
1918 | List<UUID> uuids = new List<UUID>(); | ||
1919 | |||
1920 | lock (m_dbLock) | ||
1921 | { | ||
1922 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | ||
1923 | { | ||
1924 | dbcon.Open(); | ||
1925 | |||
1926 | using (MySqlCommand cmd = dbcon.CreateCommand()) | ||
1927 | { | ||
1928 | cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID"; | ||
1929 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); | ||
1930 | |||
1931 | using (IDataReader reader = ExecuteReader(cmd)) | ||
1932 | { | ||
1933 | while (reader.Read()) | ||
1934 | { | ||
1935 | UUID id = new UUID(reader["UUID"].ToString()); | ||
1936 | |||
1937 | uuids.Add(id); | ||
1938 | } | ||
1939 | } | ||
1940 | } | ||
1941 | } | ||
1942 | } | ||
1943 | |||
1944 | return uuids.ToArray(); | ||
1945 | } | ||
1946 | |||
1914 | private void LoadSpawnPoints(RegionSettings rs) | 1947 | private void LoadSpawnPoints(RegionSettings rs) |
1915 | { | 1948 | { |
1916 | rs.ClearSpawnPoints(); | 1949 | rs.ClearSpawnPoints(); |