aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/SimulationService
diff options
context:
space:
mode:
authoronefang2019-09-11 16:36:50 +1000
committeronefang2019-09-11 16:36:50 +1000
commit50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch)
tree52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Services/SimulationService
parentRenamed branch to SledjChisl. (diff)
parentBump to release flavour, build 0. (diff)
downloadopensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Services/SimulationService')
-rw-r--r--OpenSim/Services/SimulationService/SimulationDataService.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Services/SimulationService/SimulationDataService.cs b/OpenSim/Services/SimulationService/SimulationDataService.cs
index d9684c4..eef958a 100644
--- a/OpenSim/Services/SimulationService/SimulationDataService.cs
+++ b/OpenSim/Services/SimulationService/SimulationDataService.cs
@@ -104,6 +104,11 @@ namespace OpenSim.Services.SimulationService
104 m_database.StoreTerrain(terrain, regionID); 104 m_database.StoreTerrain(terrain, regionID);
105 } 105 }
106 106
107 public void StoreBakedTerrain(TerrainData terrain, UUID regionID)
108 {
109 m_database.StoreBakedTerrain(terrain, regionID);
110 }
111
107 public void StoreTerrain(double[,] terrain, UUID regionID) 112 public void StoreTerrain(double[,] terrain, UUID regionID)
108 { 113 {
109 m_database.StoreTerrain(terrain, regionID); 114 m_database.StoreTerrain(terrain, regionID);
@@ -119,6 +124,11 @@ namespace OpenSim.Services.SimulationService
119 return m_database.LoadTerrain(regionID, pSizeX, pSizeY, pSizeZ); 124 return m_database.LoadTerrain(regionID, pSizeX, pSizeY, pSizeZ);
120 } 125 }
121 126
127 public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
128 {
129 return m_database.LoadBakedTerrain(regionID, pSizeX, pSizeY, pSizeZ);
130 }
131
122 public void StoreLandObject(ILandObject Parcel) 132 public void StoreLandObject(ILandObject Parcel)
123 { 133 {
124 m_database.StoreLandObject(Parcel); 134 m_database.StoreLandObject(Parcel);
@@ -173,6 +183,11 @@ namespace OpenSim.Services.SimulationService
173 m_database.RemoveRegionEnvironmentSettings(regionUUID); 183 m_database.RemoveRegionEnvironmentSettings(regionUUID);
174 } 184 }
175 185
186 public UUID[] GetObjectIDs(UUID regionID)
187 {
188 return m_database.GetObjectIDs(regionID);
189 }
190
176 public void SaveExtra(UUID regionID, string name, string val) 191 public void SaveExtra(UUID regionID, string name, string val)
177 { 192 {
178 m_database.SaveExtra(regionID, name, val); 193 m_database.SaveExtra(regionID, name, val);