aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorDan Lake2011-09-20 15:31:43 -0700
committerDan Lake2011-09-20 15:35:36 -0700
commit7ec7a3cf33b3a67cb10df14bad04cf6f09262822 (patch)
tree75da503f71aeafdf7043c2adce24855d09301f69 /OpenSim/Data
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7ec7a3cf33b3a67cb10df14bad04cf6f09262822.zip
opensim-SC_OLD-7ec7a3cf33b3a67cb10df14bad04cf6f09262822.tar.gz
opensim-SC_OLD-7ec7a3cf33b3a67cb10df14bad04cf6f09262822.tar.bz2
opensim-SC_OLD-7ec7a3cf33b3a67cb10df14bad04cf6f09262822.tar.xz
Null simulation data must return a non-null region settings or other parts of the simulator expect
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/Null/NullSimulationData.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index c33a6f2..b788976 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -77,8 +77,10 @@ namespace OpenSim.Data.Null
77 } 77 }
78 78
79 public RegionSettings LoadRegionSettings(UUID regionUUID) 79 public RegionSettings LoadRegionSettings(UUID regionUUID)
80 { 80 {
81 return null; 81 RegionSettings rs = new RegionSettings();
82 rs.RegionUUID = regionUUID;
83 return rs;
82 } 84 }
83 85
84 public void StoreObject(SceneObjectGroup obj, UUID regionUUID) 86 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)