diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Services/SimulationService/SimulationDataService.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/SimulationService/SimulationDataService.cs (renamed from OpenSim/Services/Connectors/Simulation/SimulationDataService.cs) | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/SimulationService/SimulationDataService.cs index 504fcaf..d9684c4 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs +++ b/OpenSim/Services/SimulationService/SimulationDataService.cs | |||
@@ -29,7 +29,6 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using log4net; | 31 | using log4net; |
32 | using Mono.Addins; | ||
33 | using Nini.Config; | 32 | using Nini.Config; |
34 | using System.Reflection; | 33 | using System.Reflection; |
35 | using OpenSim.Services.Base; | 34 | using OpenSim.Services.Base; |
@@ -39,7 +38,7 @@ using OpenSim.Framework; | |||
39 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
41 | 40 | ||
42 | namespace OpenSim.Services.Connectors | 41 | namespace OpenSim.Services.SimulationService |
43 | { | 42 | { |
44 | public class SimulationDataService : ServiceBase, ISimulationDataService | 43 | public class SimulationDataService : ServiceBase, ISimulationDataService |
45 | { | 44 | { |
@@ -100,6 +99,11 @@ namespace OpenSim.Services.Connectors | |||
100 | return m_database.LoadObjects(regionUUID); | 99 | return m_database.LoadObjects(regionUUID); |
101 | } | 100 | } |
102 | 101 | ||
102 | public void StoreTerrain(TerrainData terrain, UUID regionID) | ||
103 | { | ||
104 | m_database.StoreTerrain(terrain, regionID); | ||
105 | } | ||
106 | |||
103 | public void StoreTerrain(double[,] terrain, UUID regionID) | 107 | public void StoreTerrain(double[,] terrain, UUID regionID) |
104 | { | 108 | { |
105 | m_database.StoreTerrain(terrain, regionID); | 109 | m_database.StoreTerrain(terrain, regionID); |
@@ -110,6 +114,11 @@ namespace OpenSim.Services.Connectors | |||
110 | return m_database.LoadTerrain(regionID); | 114 | return m_database.LoadTerrain(regionID); |
111 | } | 115 | } |
112 | 116 | ||
117 | public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) | ||
118 | { | ||
119 | return m_database.LoadTerrain(regionID, pSizeX, pSizeY, pSizeZ); | ||
120 | } | ||
121 | |||
113 | public void StoreLandObject(ILandObject Parcel) | 122 | public void StoreLandObject(ILandObject Parcel) |
114 | { | 123 | { |
115 | m_database.StoreLandObject(Parcel); | 124 | m_database.StoreLandObject(Parcel); |