diff options
author | Justin Clark-Casey (justincc) | 2009-09-25 19:19:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-25 19:19:01 +0100 |
commit | 0bdf75637ff67ee443fa5c4d335c76ca594c254a (patch) | |
tree | 52c546b2118101b7bb82ccc7dee273573c8fa0a2 /OpenSim/Data/Null | |
parent | Don't preserve full user profile details within iars for now (diff) | |
parent | More small changes to FlotsamAssetCache as per mcortez' request. (diff) | |
download | opensim-SC-0bdf75637ff67ee443fa5c4d335c76ca594c254a.zip opensim-SC-0bdf75637ff67ee443fa5c4d335c76ca594c254a.tar.gz opensim-SC-0bdf75637ff67ee443fa5c4d335c76ca594c254a.tar.bz2 opensim-SC-0bdf75637ff67ee443fa5c4d335c76ca594c254a.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Null')
-rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index e976c40..218fcd0 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
@@ -101,10 +101,7 @@ namespace OpenSim.Data.Null | |||
101 | ret.Add(r); | 101 | ret.Add(r); |
102 | } | 102 | } |
103 | 103 | ||
104 | if (ret.Count > 0) | 104 | return ret; |
105 | return ret; | ||
106 | |||
107 | return null; | ||
108 | } | 105 | } |
109 | 106 | ||
110 | public bool Store(RegionData data) | 107 | public bool Store(RegionData data) |