aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-09 00:47:23 +0100
committerJustin Clark-Casey (justincc)2011-09-09 00:47:23 +0100
commit42790f021fd5d69ba10ac02d158681f3d299da80 (patch)
tree392382b44126df9304861591047c08df0da35fe2 /OpenSim
parentSave the default terrain texture UUIDs for a new region instead of leaving th... (diff)
downloadopensim-SC_OLD-42790f021fd5d69ba10ac02d158681f3d299da80.zip
opensim-SC_OLD-42790f021fd5d69ba10ac02d158681f3d299da80.tar.gz
opensim-SC_OLD-42790f021fd5d69ba10ac02d158681f3d299da80.tar.bz2
opensim-SC_OLD-42790f021fd5d69ba10ac02d158681f3d299da80.tar.xz
Fix unit tests from RegionSettings commit
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/Null/NullSimulationData.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs4
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index e8d733b..c33a6f2 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -59,19 +59,23 @@ namespace OpenSim.Data.Null
59 public void StoreRegionSettings(RegionSettings rs) 59 public void StoreRegionSettings(RegionSettings rs)
60 { 60 {
61 } 61 }
62
62 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) 63 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
63 { 64 {
64 //This connector doesn't support the windlight module yet 65 //This connector doesn't support the windlight module yet
65 //Return default LL windlight settings 66 //Return default LL windlight settings
66 return new RegionLightShareData(); 67 return new RegionLightShareData();
67 } 68 }
69
68 public void RemoveRegionWindlightSettings(UUID regionID) 70 public void RemoveRegionWindlightSettings(UUID regionID)
69 { 71 {
70 } 72 }
73
71 public void StoreRegionWindlightSettings(RegionLightShareData wl) 74 public void StoreRegionWindlightSettings(RegionLightShareData wl)
72 { 75 {
73 //This connector doesn't support the windlight module yet 76 //This connector doesn't support the windlight module yet
74 } 77 }
78
75 public RegionSettings LoadRegionSettings(UUID regionUUID) 79 public RegionSettings LoadRegionSettings(UUID regionUUID)
76 { 80 {
77 return null; 81 return null;
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 2ea36da..79bb9c2 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -163,6 +163,10 @@ namespace OpenSim.Data.Null
163 { 163 {
164 RegionSettings rs = null; 164 RegionSettings rs = null;
165 m_regionSettings.TryGetValue(regionUUID, out rs); 165 m_regionSettings.TryGetValue(regionUUID, out rs);
166
167 if (rs == null)
168 rs = new RegionSettings();
169
166 return rs; 170 return rs;
167 } 171 }
168 172