diff options
| author | Justin Clark-Casey (justincc) | 2011-09-21 20:05:11 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-21 20:05:11 +0100 |
| commit | c9c40343afb313ee6999c6dfb2663fb06bfac407 (patch) | |
| tree | 2a2bf7ab76ad67446acad971d19b93118a616de3 /OpenSim/Data/Null/NullSimulationData.cs | |
| parent | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. (diff) | |
| parent | Null simulation data must return a non-null region settings or other parts of... (diff) | |
| download | opensim-SC-c9c40343afb313ee6999c6dfb2663fb06bfac407.zip opensim-SC-c9c40343afb313ee6999c6dfb2663fb06bfac407.tar.gz opensim-SC-c9c40343afb313ee6999c6dfb2663fb06bfac407.tar.bz2 opensim-SC-c9c40343afb313ee6999c6dfb2663fb06bfac407.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Null/NullSimulationData.cs')
| -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) |