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/Region/Framework/Interfaces | |
| 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/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs index 0fcafcc..ccb583d 100644 --- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs +++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs | |||
| @@ -116,5 +116,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 116 | /// <param name="regionUUID">the region UUID</param> | 116 | /// <param name="regionUUID">the region UUID</param> |
| 117 | void RemoveRegionEnvironmentSettings(UUID regionUUID); | 117 | void RemoveRegionEnvironmentSettings(UUID regionUUID); |
| 118 | 118 | ||
| 119 | UUID[] GetObjectIDs(UUID regionID); | ||
| 119 | } | 120 | } |
| 120 | } | 121 | } |
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 |