aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 8daa19d..a73a0b8 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -174,15 +174,15 @@ namespace OpenSim.Data.Null
174 public class NullDataStore : ISimulationDataStore 174 public class NullDataStore : ISimulationDataStore
175 { 175 {
176// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 176// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
177 177
178 protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); 178 protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>();
179 protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); 179 protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>();
180 protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems 180 protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems
181 = new Dictionary<UUID, ICollection<TaskInventoryItem>>(); 181 = new Dictionary<UUID, ICollection<TaskInventoryItem>>();
182 protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>(); 182 protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>();
183 protected Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>(); 183 protected Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>();
184 protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>(); 184 protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>();
185 185
186 public void Initialise(string dbfile) 186 public void Initialise(string dbfile)
187 { 187 {
188 return; 188 return;
@@ -196,14 +196,14 @@ namespace OpenSim.Data.Null
196 { 196 {
197 m_regionSettings[rs.RegionUUID] = rs; 197 m_regionSettings[rs.RegionUUID] = rs;
198 } 198 }
199 199
200 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) 200 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
201 { 201 {
202 //This connector doesn't support the windlight module yet 202 //This connector doesn't support the windlight module yet
203 //Return default LL windlight settings 203 //Return default LL windlight settings
204 return new RegionLightShareData(); 204 return new RegionLightShareData();
205 } 205 }
206 206
207 public void RemoveRegionWindlightSettings(UUID regionID) 207 public void RemoveRegionWindlightSettings(UUID regionID)
208 { 208 {
209 } 209 }
@@ -238,7 +238,7 @@ namespace OpenSim.Data.Null
238 238
239 if (rs == null) 239 if (rs == null)
240 rs = new RegionSettings(); 240 rs = new RegionSettings();
241 241
242 return rs; 242 return rs;
243 } 243 }
244 244
@@ -250,9 +250,9 @@ namespace OpenSim.Data.Null
250 foreach (SceneObjectPart prim in obj.Parts) 250 foreach (SceneObjectPart prim in obj.Parts)
251 { 251 {
252// m_log.DebugFormat( 252// m_log.DebugFormat(
253// "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", 253// "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}",
254// prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID); 254// prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID);
255 255
256 m_sceneObjectParts[prim.UUID] = prim; 256 m_sceneObjectParts[prim.UUID] = prim;
257 } 257 }
258 } 258 }
@@ -266,7 +266,7 @@ namespace OpenSim.Data.Null
266 if (part.ParentGroup.UUID == obj) 266 if (part.ParentGroup.UUID == obj)
267 { 267 {
268// m_log.DebugFormat( 268// m_log.DebugFormat(
269// "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 269// "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}",
270// part.Name, part.UUID, obj, regionUUID); 270// part.Name, part.UUID, obj, regionUUID);
271 m_sceneObjectParts.Remove(part.UUID); 271 m_sceneObjectParts.Remove(part.UUID);
272 } 272 }
@@ -281,7 +281,7 @@ namespace OpenSim.Data.Null
281 public List<SceneObjectGroup> LoadObjects(UUID regionUUID) 281 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
282 { 282 {
283 Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); 283 Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
284 284
285 // Create all of the SOGs from the root prims first 285 // Create all of the SOGs from the root prims first
286 foreach (SceneObjectPart prim in m_sceneObjectParts.Values) 286 foreach (SceneObjectPart prim in m_sceneObjectParts.Values)
287 { 287 {
@@ -318,10 +318,10 @@ namespace OpenSim.Data.Null
318 } 318 }
319 } 319 }
320 } 320 }
321 321
322 // TODO: Load items. This is assymetric - we store items as a separate method but don't retrieve them that 322 // TODO: Load items. This is assymetric - we store items as a separate method but don't retrieve them that
323 // way! 323 // way!
324 324
325 return new List<SceneObjectGroup>(objects.Values); 325 return new List<SceneObjectGroup>(objects.Values);
326 } 326 }
327 327