diff options
| author | Melanie | 2010-11-03 02:34:36 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-03 02:34:36 +0000 |
| commit | 5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8 (patch) | |
| tree | 7d9deca98fbb3cf3f38a0938fcd28509bb783228 /OpenSim/Region/Framework | |
| parent | Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 (diff) | |
| parent | Add lsClearWindlightScene() to the lightshare module to remove WL settings (diff) | |
| download | opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.zip opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.gz opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.bz2 opensim-SC-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 edaa07c..5295a72 100644 --- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs +++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs | |||
| @@ -94,5 +94,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 94 | RegionSettings LoadRegionSettings(UUID regionUUID); | 94 | RegionSettings LoadRegionSettings(UUID regionUUID); |
| 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 | } | 98 | } |
| 98 | } | 99 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs index 0a4d531..615f377 100644 --- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs | |||
| @@ -105,6 +105,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 105 | RegionSettings LoadRegionSettings(UUID regionUUID); | 105 | RegionSettings LoadRegionSettings(UUID regionUUID); |
| 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 | 109 | ||
| 109 | void Shutdown(); | 110 | void Shutdown(); |
| 110 | } | 111 | } |