Merge branch 'master' into careminster-presence-refactor

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/Interfaces/ISimulationDataService.cs
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_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.zip
opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.gz
opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.bz2
opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.xz
1 files changed, 1 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
        RegionSettings LoadRegionSettings(UUID regionUUID);
        RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
        void StoreRegionWindlightSettings(RegionLightShareData wl);
+        void RemoveRegionWindlightSettings(UUID regionID);
    }
 }
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/Interfaces/ISimulationDataService.cs
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_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.zip opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.gz opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.bz2 opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.xz

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	}