OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make public interface methods in MySQLSimulation data virtual so the CM 

data layer can inherit from it
avinationmerge
Melanie 2011-05-20 23:17:46 +02:00
parent e62d1cc480
commit 8a46484a59
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@ -130,7 +130,7 @@ namespace OpenSim.Data.MySQL
public void Dispose() {} public void Dispose() {}
public void StoreObject(SceneObjectGroup obj, UUID regionUUID) public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
{ {
uint flags = obj.RootPart.GetEffectiveObjectFlags(); uint flags = obj.RootPart.GetEffectiveObjectFlags();
@ -258,7 +258,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public void RemoveObject(UUID obj, UUID regionUUID) public virtual void RemoveObject(UUID obj, UUID regionUUID)
{ {
// m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID); // m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
@ -407,7 +407,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public List<SceneObjectGroup> LoadObjects(UUID regionID) public virtual List<SceneObjectGroup> LoadObjects(UUID regionID)
{ {
const int ROWS_PER_QUERY = 5000; const int ROWS_PER_QUERY = 5000;
@ -576,7 +576,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public void StoreTerrain(double[,] ter, UUID regionID) public virtual void StoreTerrain(double[,] ter, UUID regionID)
{ {
m_log.Info("[REGION DB]: Storing terrain"); m_log.Info("[REGION DB]: Storing terrain");
@ -605,7 +605,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public double[,] LoadTerrain(UUID regionID) public virtual double[,] LoadTerrain(UUID regionID)
{ {
double[,] terrain = null; double[,] terrain = null;
@ -655,7 +655,7 @@ namespace OpenSim.Data.MySQL
return terrain; return terrain;
} }
public void RemoveLandObject(UUID globalID) public virtual void RemoveLandObject(UUID globalID)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {
@ -674,7 +674,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public void StoreLandObject(ILandObject parcel) public virtual void StoreLandObject(ILandObject parcel)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {
@ -731,7 +731,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
{ {
RegionLightShareData nWP = new RegionLightShareData(); RegionLightShareData nWP = new RegionLightShareData();
nWP.OnSave += StoreRegionWindlightSettings; nWP.OnSave += StoreRegionWindlightSettings;
@ -828,7 +828,7 @@ namespace OpenSim.Data.MySQL
return nWP; return nWP;
} }
public RegionSettings LoadRegionSettings(UUID regionUUID) public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
{ {
RegionSettings rs = null; RegionSettings rs = null;
@ -866,7 +866,7 @@ namespace OpenSim.Data.MySQL
return rs; return rs;
} }
public void StoreRegionWindlightSettings(RegionLightShareData wl) public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
@ -969,7 +969,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public void RemoveRegionWindlightSettings(UUID regionID) public virtual void RemoveRegionWindlightSettings(UUID regionID)
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
@ -984,7 +984,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public void StoreRegionSettings(RegionSettings rs) public virtual void StoreRegionSettings(RegionSettings rs)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {
@ -1036,7 +1036,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public List<LandData> LoadLandObjects(UUID regionUUID) public virtual List<LandData> LoadLandObjects(UUID regionUUID)
{ {
List<LandData> landData = new List<LandData>(); List<LandData> landData = new List<LandData>();
@ -1802,7 +1802,7 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
} }
public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {