aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 00:54:23 +0100
committerUbitUmarov2012-07-17 00:54:23 +0100
commitd5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch)
tree8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
parentUbitOde: remove useless water collider from active code. (diff)
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs35
1 files changed, 34 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 38fbbe3..3f99a39 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -113,6 +113,21 @@ namespace OpenSim.Data.Null
113 m_store.StoreRegionWindlightSettings(wl); 113 m_store.StoreRegionWindlightSettings(wl);
114 } 114 }
115 115
116 public string LoadRegionEnvironmentSettings(UUID regionUUID)
117 {
118 return m_store.LoadRegionEnvironmentSettings(regionUUID);
119 }
120
121 public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
122 {
123 m_store.StoreRegionEnvironmentSettings(regionUUID, settings);
124 }
125
126 public void RemoveRegionEnvironmentSettings(UUID regionUUID)
127 {
128 m_store.RemoveRegionEnvironmentSettings(regionUUID);
129 }
130
116 public UUID[] GetObjectIDs(UUID regionID) 131 public UUID[] GetObjectIDs(UUID regionID)
117 { 132 {
118 return new UUID[0]; 133 return new UUID[0];
@@ -163,7 +178,25 @@ namespace OpenSim.Data.Null
163 { 178 {
164 //This connector doesn't support the windlight module yet 179 //This connector doesn't support the windlight module yet
165 } 180 }
166 181
182 #region Environment Settings
183 public string LoadRegionEnvironmentSettings(UUID regionUUID)
184 {
185 //This connector doesn't support the Environment module yet
186 return string.Empty;
187 }
188
189 public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
190 {
191 //This connector doesn't support the Environment module yet
192 }
193
194 public void RemoveRegionEnvironmentSettings(UUID regionUUID)
195 {
196 //This connector doesn't support the Environment module yet
197 }
198 #endregion
199
167 public RegionSettings LoadRegionSettings(UUID regionUUID) 200 public RegionSettings LoadRegionSettings(UUID regionUUID)
168 { 201 {
169 RegionSettings rs = null; 202 RegionSettings rs = null;