aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
diff options
context:
space:
mode:
authorTom2011-09-14 19:11:32 -0700
committerTom2011-09-14 19:11:32 -0700
commit5484c9b585a2a6289456e9492ac2989d489b555c (patch)
treec9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
parentMerge fixes, and fix the build (diff)
parentDon't try and delete attachments for child agent close (diff)
downloadopensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.zip
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz
Bring us up to date.
Diffstat (limited to 'OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs')
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs4
1 files changed, 4 insertions, 0 deletions
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