diff options
author | Melanie | 2011-04-06 09:22:55 +0100 |
---|---|---|
committer | Melanie | 2011-04-06 09:22:55 +0100 |
commit | 407c2b182303d3bc1214e71f407bddc28c671a55 (patch) | |
tree | e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Data/Null | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Change some text to make the autoreturn mechanism more obvious, and align wit... (diff) | |
download | opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.zip opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2 opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/Null')
-rwxr-xr-x | OpenSim/Data/Null/NullEstateData.cs | 133 | ||||
-rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 17 |
2 files changed, 150 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs new file mode 100755 index 0000000..0cebff5 --- /dev/null +++ b/OpenSim/Data/Null/NullEstateData.cs | |||
@@ -0,0 +1,133 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using log4net; | ||
32 | using OpenMetaverse; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Region.Framework; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | |||
37 | namespace OpenSim.Data.Null | ||
38 | { | ||
39 | public class NullEstateStore : IEstateDataStore | ||
40 | { | ||
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
43 | private string m_connectionString; | ||
44 | |||
45 | protected virtual Assembly Assembly | ||
46 | { | ||
47 | get { return GetType().Assembly; } | ||
48 | } | ||
49 | |||
50 | public NullEstateStore() | ||
51 | { | ||
52 | } | ||
53 | |||
54 | public NullEstateStore(string connectionString) | ||
55 | { | ||
56 | Initialise(connectionString); | ||
57 | } | ||
58 | |||
59 | public void Initialise(string connectionString) | ||
60 | { | ||
61 | m_connectionString = connectionString; | ||
62 | } | ||
63 | |||
64 | private string[] FieldList | ||
65 | { | ||
66 | get { return new string[0]; } | ||
67 | } | ||
68 | |||
69 | public EstateSettings LoadEstateSettings(UUID regionID, bool create) | ||
70 | { | ||
71 | // This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase). | ||
72 | // The estate info is pretty empty so don't try banning anyone. | ||
73 | EstateSettings oneEstate = new EstateSettings(); | ||
74 | oneEstate.EstateID = 1; | ||
75 | return oneEstate; | ||
76 | } | ||
77 | |||
78 | public void StoreEstateSettings(EstateSettings es) | ||
79 | { | ||
80 | return; | ||
81 | } | ||
82 | |||
83 | public EstateSettings LoadEstateSettings(int estateID) | ||
84 | { | ||
85 | return new EstateSettings(); | ||
86 | } | ||
87 | |||
88 | public List<EstateSettings> LoadEstateSettingsAll() | ||
89 | { | ||
90 | List<EstateSettings> allEstateSettings = new List<EstateSettings>(); | ||
91 | allEstateSettings.Add(new EstateSettings()); | ||
92 | return allEstateSettings; | ||
93 | } | ||
94 | |||
95 | public List<int> GetEstatesAll() | ||
96 | { | ||
97 | List<int> result = new List<int>(); | ||
98 | return result; | ||
99 | } | ||
100 | |||
101 | public List<int> GetEstates(string search) | ||
102 | { | ||
103 | List<int> result = new List<int>(); | ||
104 | return result; | ||
105 | } | ||
106 | |||
107 | public bool LinkRegion(UUID regionID, int estateID) | ||
108 | { | ||
109 | return false; | ||
110 | } | ||
111 | |||
112 | public List<UUID> GetRegions(int estateID) | ||
113 | { | ||
114 | List<UUID> result = new List<UUID>(); | ||
115 | return result; | ||
116 | } | ||
117 | |||
118 | public bool DeleteEstate(int estateID) | ||
119 | { | ||
120 | return false; | ||
121 | } | ||
122 | |||
123 | #region IEstateDataStore Members | ||
124 | |||
125 | |||
126 | public List<int> GetEstatesByOwner(UUID ownerID) | ||
127 | { | ||
128 | return new List<int>(); | ||
129 | } | ||
130 | |||
131 | #endregion | ||
132 | } | ||
133 | } | ||
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index eb4e313..e8d733b 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
@@ -38,6 +38,15 @@ namespace OpenSim.Data.Null | |||
38 | /// </summary> | 38 | /// </summary> |
39 | public class NullSimulationData : ISimulationDataStore | 39 | public class NullSimulationData : ISimulationDataStore |
40 | { | 40 | { |
41 | public NullSimulationData() | ||
42 | { | ||
43 | } | ||
44 | |||
45 | public NullSimulationData(string connectionString) | ||
46 | { | ||
47 | Initialise(connectionString); | ||
48 | } | ||
49 | |||
41 | public void Initialise(string dbfile) | 50 | public void Initialise(string dbfile) |
42 | { | 51 | { |
43 | return; | 52 | return; |
@@ -85,12 +94,20 @@ namespace OpenSim.Data.Null | |||
85 | return new List<SceneObjectGroup>(); | 94 | return new List<SceneObjectGroup>(); |
86 | } | 95 | } |
87 | 96 | ||
97 | Dictionary<UUID, double[,]> m_terrains = new Dictionary<UUID, double[,]>(); | ||
88 | public void StoreTerrain(double[,] ter, UUID regionID) | 98 | public void StoreTerrain(double[,] ter, UUID regionID) |
89 | { | 99 | { |
100 | if (m_terrains.ContainsKey(regionID)) | ||
101 | m_terrains.Remove(regionID); | ||
102 | m_terrains.Add(regionID, ter); | ||
90 | } | 103 | } |
91 | 104 | ||
92 | public double[,] LoadTerrain(UUID regionID) | 105 | public double[,] LoadTerrain(UUID regionID) |
93 | { | 106 | { |
107 | if (m_terrains.ContainsKey(regionID)) | ||
108 | { | ||
109 | return m_terrains[regionID]; | ||
110 | } | ||
94 | return null; | 111 | return null; |
95 | } | 112 | } |
96 | 113 | ||