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/Tests | |
| 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/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index 2e5020b..2ea36da 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
| @@ -104,6 +104,10 @@ namespace OpenSim.Data.Null | |||
| 104 | return m_store.LoadRegionWindlightSettings(regionUUID); | 104 | return m_store.LoadRegionWindlightSettings(regionUUID); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
| 108 | { | ||
| 109 | } | ||
| 110 | |||
| 107 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 111 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
| 108 | { | 112 | { |
| 109 | m_store.StoreRegionWindlightSettings(wl); | 113 | m_store.StoreRegionWindlightSettings(wl); |
| @@ -146,6 +150,10 @@ namespace OpenSim.Data.Null | |||
| 146 | return new RegionLightShareData(); | 150 | return new RegionLightShareData(); |
| 147 | } | 151 | } |
| 148 | 152 | ||
| 153 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
| 154 | { | ||
| 155 | } | ||
| 156 | |||
| 149 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 157 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
| 150 | { | 158 | { |
| 151 | //This connector doesn't support the windlight module yet | 159 | //This connector doesn't support the windlight module yet |
| @@ -274,4 +282,4 @@ namespace OpenSim.Data.Null | |||
| 274 | { | 282 | { |
| 275 | } | 283 | } |
| 276 | } | 284 | } |
| 277 | } \ No newline at end of file | 285 | } |