diff options
| author | Kitto Flora | 2009-09-30 19:07:18 +0200 |
|---|---|---|
| committer | Kitto Flora | 2009-09-30 19:07:18 +0200 |
| commit | 07df0e0ab0c69633a6afec8d05cccc117656d3d9 (patch) | |
| tree | 3048cc38b313e255cbf03fa3e2900e28cadc47c9 /OpenSim/Data/Null/NullRegionData.cs | |
| parent | And another merge issue (diff) | |
| parent | Fix loading modules with alternate configurations and ports into ROBUST. (diff) | |
| download | opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.zip opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.gz opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.bz2 opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.xz | |
Merge branch '0.6.7-post-fixes' into vehicles
Diffstat (limited to 'OpenSim/Data/Null/NullRegionData.cs')
| -rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index 588b8ac..218fcd0 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
| @@ -40,6 +40,7 @@ namespace OpenSim.Data.Null | |||
| 40 | 40 | ||
| 41 | public NullRegionData(string connectionString, string realm) | 41 | public NullRegionData(string connectionString, string realm) |
| 42 | { | 42 | { |
| 43 | //Console.WriteLine("[XXX] NullRegionData constructor"); | ||
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | public List<RegionData> Get(string regionName, UUID scopeID) | 46 | public List<RegionData> Get(string regionName, UUID scopeID) |
| @@ -100,10 +101,7 @@ namespace OpenSim.Data.Null | |||
| 100 | ret.Add(r); | 101 | ret.Add(r); |
| 101 | } | 102 | } |
| 102 | 103 | ||
| 103 | if (ret.Count > 0) | 104 | return ret; |
| 104 | return ret; | ||
| 105 | |||
| 106 | return null; | ||
| 107 | } | 105 | } |
| 108 | 106 | ||
| 109 | public bool Store(RegionData data) | 107 | public bool Store(RegionData data) |