diff options
author | UbitUmarov | 2015-09-28 16:47:44 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-28 16:47:44 +0100 |
commit | e0de76aa14d5db02ae88949144cf96ef517b1b64 (patch) | |
tree | d9df6fc7c9173b78fd7055f9024295ee7039db3e /OpenSim/Data/MySQL | |
parent | ... ossl merge issue (diff) | |
download | opensim-SC-e0de76aa14d5db02ae88949144cf96ef517b1b64.zip opensim-SC-e0de76aa14d5db02ae88949144cf96ef517b1b64.tar.gz opensim-SC-e0de76aa14d5db02ae88949144cf96ef517b1b64.tar.bz2 opensim-SC-e0de76aa14d5db02ae88949144cf96ef517b1b64.tar.xz |
put back virtual declarations
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index d83ad65..a62d347 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Data.MySQL | |||
76 | Initialise(connectionString); | 76 | Initialise(connectionString); |
77 | } | 77 | } |
78 | 78 | ||
79 | public void Initialise(string connectionString) | 79 | public virtual void Initialise(string connectionString) |
80 | { | 80 | { |
81 | m_connectionString = connectionString; | 81 | m_connectionString = connectionString; |
82 | 82 | ||
@@ -123,7 +123,7 @@ namespace OpenSim.Data.MySQL | |||
123 | 123 | ||
124 | public void Dispose() {} | 124 | public void Dispose() {} |
125 | 125 | ||
126 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) | 126 | public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID) |
127 | { | 127 | { |
128 | uint flags = obj.RootPart.GetEffectiveObjectFlags(); | 128 | uint flags = obj.RootPart.GetEffectiveObjectFlags(); |
129 | 129 | ||
@@ -263,7 +263,7 @@ namespace OpenSim.Data.MySQL | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | public void RemoveObject(UUID obj, UUID regionUUID) | 266 | public virtual void RemoveObject(UUID obj, UUID regionUUID) |
267 | { | 267 | { |
268 | // m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID); | 268 | // m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID); |
269 | 269 | ||
@@ -413,7 +413,7 @@ namespace OpenSim.Data.MySQL | |||
413 | } | 413 | } |
414 | } | 414 | } |
415 | 415 | ||
416 | public List<SceneObjectGroup> LoadObjects(UUID regionID) | 416 | public virtual List<SceneObjectGroup> LoadObjects(UUID regionID) |
417 | { | 417 | { |
418 | const int ROWS_PER_QUERY = 5000; | 418 | const int ROWS_PER_QUERY = 5000; |
419 | 419 | ||
@@ -638,7 +638,7 @@ namespace OpenSim.Data.MySQL | |||
638 | } | 638 | } |
639 | 639 | ||
640 | // Legacy region loading | 640 | // Legacy region loading |
641 | public double[,] LoadTerrain(UUID regionID) | 641 | public virtual double[,] LoadTerrain(UUID regionID) |
642 | { | 642 | { |
643 | double[,] ret = null; | 643 | double[,] ret = null; |
644 | TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); | 644 | TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); |
@@ -684,7 +684,7 @@ namespace OpenSim.Data.MySQL | |||
684 | return terrData; | 684 | return terrData; |
685 | } | 685 | } |
686 | 686 | ||
687 | public void RemoveLandObject(UUID globalID) | 687 | public virtual void RemoveLandObject(UUID globalID) |
688 | { | 688 | { |
689 | lock (m_dbLock) | 689 | lock (m_dbLock) |
690 | { | 690 | { |
@@ -703,7 +703,7 @@ namespace OpenSim.Data.MySQL | |||
703 | } | 703 | } |
704 | } | 704 | } |
705 | 705 | ||
706 | public void StoreLandObject(ILandObject parcel) | 706 | public virtual void StoreLandObject(ILandObject parcel) |
707 | { | 707 | { |
708 | lock (m_dbLock) | 708 | lock (m_dbLock) |
709 | { | 709 | { |
@@ -762,7 +762,7 @@ namespace OpenSim.Data.MySQL | |||
762 | } | 762 | } |
763 | } | 763 | } |
764 | 764 | ||
765 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | 765 | public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) |
766 | { | 766 | { |
767 | RegionLightShareData nWP = new RegionLightShareData(); | 767 | RegionLightShareData nWP = new RegionLightShareData(); |
768 | nWP.OnSave += StoreRegionWindlightSettings; | 768 | nWP.OnSave += StoreRegionWindlightSettings; |
@@ -860,7 +860,7 @@ namespace OpenSim.Data.MySQL | |||
860 | return nWP; | 860 | return nWP; |
861 | } | 861 | } |
862 | 862 | ||
863 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 863 | public virtual RegionSettings LoadRegionSettings(UUID regionUUID) |
864 | { | 864 | { |
865 | RegionSettings rs = null; | 865 | RegionSettings rs = null; |
866 | 866 | ||
@@ -900,7 +900,7 @@ namespace OpenSim.Data.MySQL | |||
900 | return rs; | 900 | return rs; |
901 | } | 901 | } |
902 | 902 | ||
903 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 903 | public virtual void StoreRegionWindlightSettings(RegionLightShareData wl) |
904 | { | 904 | { |
905 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 905 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
906 | { | 906 | { |
@@ -1003,7 +1003,7 @@ namespace OpenSim.Data.MySQL | |||
1003 | } | 1003 | } |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | public void RemoveRegionWindlightSettings(UUID regionID) | 1006 | public virtual void RemoveRegionWindlightSettings(UUID regionID) |
1007 | { | 1007 | { |
1008 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 1008 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
1009 | { | 1009 | { |
@@ -1080,7 +1080,7 @@ namespace OpenSim.Data.MySQL | |||
1080 | } | 1080 | } |
1081 | #endregion | 1081 | #endregion |
1082 | 1082 | ||
1083 | public void StoreRegionSettings(RegionSettings rs) | 1083 | public virtual void StoreRegionSettings(RegionSettings rs) |
1084 | { | 1084 | { |
1085 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 1085 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
1086 | { | 1086 | { |
@@ -1133,7 +1133,7 @@ namespace OpenSim.Data.MySQL | |||
1133 | } | 1133 | } |
1134 | } | 1134 | } |
1135 | 1135 | ||
1136 | public List<LandData> LoadLandObjects(UUID regionUUID) | 1136 | public virtual List<LandData> LoadLandObjects(UUID regionUUID) |
1137 | { | 1137 | { |
1138 | List<LandData> landData = new List<LandData>(); | 1138 | List<LandData> landData = new List<LandData>(); |
1139 | 1139 | ||
@@ -1982,7 +1982,7 @@ namespace OpenSim.Data.MySQL | |||
1982 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); | 1982 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) | 1985 | public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) |
1986 | { | 1986 | { |
1987 | lock (m_dbLock) | 1987 | lock (m_dbLock) |
1988 | { | 1988 | { |