diff options
| author | Melanie | 2011-10-11 22:26:18 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 22:26:18 +0100 |
| commit | 9935eb65781b4faf1ec11e06107d4f4fef2dcc40 (patch) | |
| tree | 447b9e015e5f256c73cdc743dcfa97d2566741ca /OpenSim | |
| parent | Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge (diff) | |
| parent | Null simulation data must return a non-null region settings or other parts of... (diff) | |
| download | opensim-SC-9935eb65781b4faf1ec11e06107d4f4fef2dcc40.zip opensim-SC-9935eb65781b4faf1ec11e06107d4f4fef2dcc40.tar.gz opensim-SC-9935eb65781b4faf1ec11e06107d4f4fef2dcc40.tar.bz2 opensim-SC-9935eb65781b4faf1ec11e06107d4f4fef2dcc40.tar.xz | |
Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 6 |
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) |