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

put back virtual declarations

avinationmerge
UbitUmarov 2015-09-28 16:47:44 +01:00
parent fb69661bb9
commit e0de76aa14
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

@ -76,7 +76,7 @@ namespace OpenSim.Data.MySQL
Initialise(connectionString); Initialise(connectionString);
} }
public void Initialise(string connectionString) public virtual void Initialise(string connectionString)
{ {
m_connectionString = connectionString; m_connectionString = connectionString;
@ -123,7 +123,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();
@ -263,7 +263,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);
@ -413,7 +413,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;
@ -638,7 +638,7 @@ namespace OpenSim.Data.MySQL
} }
// Legacy region loading // Legacy region loading
public double[,] LoadTerrain(UUID regionID) public virtual double[,] LoadTerrain(UUID regionID)
{ {
double[,] ret = null; double[,] ret = null;
TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
@ -684,7 +684,7 @@ namespace OpenSim.Data.MySQL
return terrData; return terrData;
} }
public void RemoveLandObject(UUID globalID) public virtual void RemoveLandObject(UUID globalID)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {
@ -703,7 +703,7 @@ namespace OpenSim.Data.MySQL
} }
} }
public void StoreLandObject(ILandObject parcel) public virtual void StoreLandObject(ILandObject parcel)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {
@ -762,7 +762,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;
@ -860,7 +860,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;
@ -900,7 +900,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))
{ {
@ -1003,7 +1003,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))
{ {
@ -1080,7 +1080,7 @@ namespace OpenSim.Data.MySQL
} }
#endregion #endregion
public void StoreRegionSettings(RegionSettings rs) public virtual void StoreRegionSettings(RegionSettings rs)
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
@ -1133,7 +1133,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>();
@ -1982,7 +1982,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)
{ {