Merge branch 'avination' into careminster

Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
author: Melanie 2012-06-11 16:56:40 +0100
committer: Melanie 2012-06-11 16:56:40 +0100
commit: 84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch)
tree: c22592aaf31bee652924b8016b60d24096d441c5 /OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
parent: Merge branch 'master' into careminster (diff)
parent: Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff)
download: opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip
opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz
opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2
opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index e424976..d7c80f7 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.Framework.Interfaces
        RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
        void StoreRegionWindlightSettings(RegionLightShareData wl);
        void RemoveRegionWindlightSettings(UUID regionID);
+        UUID[] GetObjectIDs(UUID regionID);
        /// <summary>
        /// Load Environment settings from region storage
author	Melanie	2012-06-11 16:56:40 +0100
committer	Melanie	2012-06-11 16:56:40 +0100
commit	84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch)
tree	c22592aaf31bee652924b8016b60d24096d441c5 /OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
parent	Merge branch 'master' into careminster (diff)
parent	Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff)
download	opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2 opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.xz

diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs index e424976..d7c80f7 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	/// <summary>	111	/// <summary>
111	/// Load Environment settings from region storage	112	/// Load Environment settings from region storage