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/Data/Null | |
| 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/Data/Null')
| -rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index 34d3a4e..eb4e313 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
| @@ -56,6 +56,9 @@ namespace OpenSim.Data.Null | |||
| 56 | //Return default LL windlight settings | 56 | //Return default LL windlight settings |
| 57 | return new RegionLightShareData(); | 57 | return new RegionLightShareData(); |
| 58 | } | 58 | } |
| 59 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
| 60 | { | ||
| 61 | } | ||
| 59 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 62 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
| 60 | { | 63 | { |
| 61 | //This connector doesn't support the windlight module yet | 64 | //This connector doesn't support the windlight module yet |