aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-06-07 22:39:03 +0200
committerMelanie2012-06-07 22:39:03 +0200
commit26c5b329886e3bbf81e2c853ef2fc6d648ad5273 (patch)
treeb19ea7eef37fd74dfd79f5c17ab8513462add2b4 /OpenSim
parentImplement playing of the real collision sounds, change scaling for avatar (diff)
downloadopensim-SC_OLD-26c5b329886e3bbf81e2c853ef2fc6d648ad5273.zip
opensim-SC_OLD-26c5b329886e3bbf81e2c853ef2fc6d648ad5273.tar.gz
opensim-SC_OLD-26c5b329886e3bbf81e2c853ef2fc6d648ad5273.tar.bz2
opensim-SC_OLD-26c5b329886e3bbf81e2c853ef2fc6d648ad5273.tar.xz
Add the ability to query the MYSQL databse for a list of the stored prim UUIDs
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLSimulationData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs31
-rw-r--r--OpenSim/Data/Null/NullSimulationData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs4
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs1
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationDataService.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs10
8 files changed, 63 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index d9dfe86..df496a7 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -2136,5 +2136,10 @@ VALUES
2136 } 2136 }
2137 } 2137 }
2138 } 2138 }
2139
2140 public UUID[] GetObjectIDs(UUID regionID)
2141 {
2142 return new UUID[0];
2143 }
2139 } 2144 }
2140} 2145}
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index ec7a454..b978334 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1911,6 +1911,37 @@ namespace OpenSim.Data.MySQL
1911 } 1911 }
1912 } 1912 }
1913 1913
1914 public UUID[] GetObjectIDs(UUID regionID)
1915 {
1916 List<UUID> uuids = new List<UUID>();
1917
1918 lock (m_dbLock)
1919 {
1920 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
1921 {
1922 dbcon.Open();
1923
1924 using (MySqlCommand cmd = dbcon.CreateCommand())
1925 {
1926 cmd.CommandText = "select UUID prom prims where RegionUUID = ?RegionUUID";
1927 cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
1928
1929 using (IDataReader reader = ExecuteReader(cmd))
1930 {
1931 while (reader.Read())
1932 {
1933 UUID id = new UUID(reader["UUID"].ToString());
1934
1935 uuids.Add(id);
1936 }
1937 }
1938 }
1939 }
1940 }
1941
1942 return uuids.ToArray();
1943 }
1944
1914 private void LoadSpawnPoints(RegionSettings rs) 1945 private void LoadSpawnPoints(RegionSettings rs)
1915 { 1946 {
1916 rs.ClearSpawnPoints(); 1947 rs.ClearSpawnPoints();
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index b788976..24b4511 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -133,5 +133,10 @@ namespace OpenSim.Data.Null
133 public void Shutdown() 133 public void Shutdown()
134 { 134 {
135 } 135 }
136
137 public UUID[] GetObjectIDs(UUID regionID)
138 {
139 return new UUID[0];
140 }
136 } 141 }
137} 142}
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 7e7c08a..9ec285c 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2791,5 +2791,9 @@ namespace OpenSim.Data.SQLite
2791 } 2791 }
2792 } 2792 }
2793 2793
2794 public UUID[] GetObjectIDs(UUID regionID)
2795 {
2796 return new UUID[0];
2797 }
2794 } 2798 }
2795} 2799}
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
index 5295a72..5b69616 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
@@ -95,5 +95,7 @@ namespace OpenSim.Region.Framework.Interfaces
95 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); 95 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
96 void StoreRegionWindlightSettings(RegionLightShareData wl); 96 void StoreRegionWindlightSettings(RegionLightShareData wl);
97 void RemoveRegionWindlightSettings(UUID regionID); 97 void RemoveRegionWindlightSettings(UUID regionID);
98
99 UUID[] GetObjectIDs(UUID regionID);
98 } 100 }
99} 101}
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index 615f377..b7d9cfa 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.Framework.Interfaces
106 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); 106 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
107 void StoreRegionWindlightSettings(RegionLightShareData wl); 107 void StoreRegionWindlightSettings(RegionLightShareData wl);
108 void RemoveRegionWindlightSettings(UUID regionID); 108 void RemoveRegionWindlightSettings(UUID regionID);
109 UUID[] GetObjectIDs(UUID regionID);
109 110
110 void Shutdown(); 111 void Shutdown();
111 } 112 }
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index ccef50b..620bb10 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -148,5 +148,10 @@ namespace OpenSim.Services.Connectors
148 { 148 {
149 m_database.RemoveRegionWindlightSettings(regionID); 149 m_database.RemoveRegionWindlightSettings(regionID);
150 } 150 }
151
152 public UUID[] GetObjectIDs(UUID regionID)
153 {
154 return m_database.GetObjectIDs(regionID);
155 }
151 } 156 }
152} 157}
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 579d41c..38fbbe3 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -112,6 +112,11 @@ namespace OpenSim.Data.Null
112 { 112 {
113 m_store.StoreRegionWindlightSettings(wl); 113 m_store.StoreRegionWindlightSettings(wl);
114 } 114 }
115
116 public UUID[] GetObjectIDs(UUID regionID)
117 {
118 return new UUID[0];
119 }
115 } 120 }
116 121
117 /// <summary> 122 /// <summary>
@@ -285,5 +290,10 @@ namespace OpenSim.Data.Null
285 public void Shutdown() 290 public void Shutdown()
286 { 291 {
287 } 292 }
293
294 public UUID[] GetObjectIDs(UUID regionID)
295 {
296 return new UUID[0];
297 }
288 } 298 }
289} 299}