diff options
author | Melanie | 2012-06-11 16:56:40 +0100 |
---|---|---|
committer | Melanie | 2012-06-11 16:56:40 +0100 |
commit | 84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch) | |
tree | c22592aaf31bee652924b8016b60d24096d441c5 /OpenSim/Data | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff) | |
download | opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2 opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 5 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 37 | ||||
-rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 5 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 4 |
4 files changed, 49 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index 3f29f5b..47fb6d7 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
@@ -2202,5 +2202,10 @@ VALUES | |||
2202 | } | 2202 | } |
2203 | } | 2203 | } |
2204 | } | 2204 | } |
2205 | |||
2206 | public UUID[] GetObjectIDs(UUID regionID) | ||
2207 | { | ||
2208 | return new UUID[0]; | ||
2209 | } | ||
2205 | } | 2210 | } |
2206 | } | 2211 | } |
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(); |
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index 8f2314f..a39ef0b 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
@@ -151,5 +151,10 @@ namespace OpenSim.Data.Null | |||
151 | public void Shutdown() | 151 | public void Shutdown() |
152 | { | 152 | { |
153 | } | 153 | } |
154 | |||
155 | public UUID[] GetObjectIDs(UUID regionID) | ||
156 | { | ||
157 | return new UUID[0]; | ||
158 | } | ||
154 | } | 159 | } |
155 | } | 160 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index f40e866..9175a8f 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -2890,5 +2890,9 @@ namespace OpenSim.Data.SQLite | |||
2890 | } | 2890 | } |
2891 | } | 2891 | } |
2892 | 2892 | ||
2893 | public UUID[] GetObjectIDs(UUID regionID) | ||
2894 | { | ||
2895 | return new UUID[0]; | ||
2896 | } | ||
2893 | } | 2897 | } |
2894 | } | 2898 | } |