diff options
author | Melanie | 2010-11-03 02:31:43 +0000 |
---|---|---|
committer | Melanie | 2010-11-03 02:31:43 +0000 |
commit | 6c3b7617b0356f093ef2730f1c517d6228997984 (patch) | |
tree | dfe891e7969aca22c0480877988ff3a8ad3d7d77 /OpenSim/Data | |
parent | When LightShare is enabled, the standard day cycle is bypassed and replaced by (diff) | |
download | opensim-SC-6c3b7617b0356f093ef2730f1c517d6228997984.zip opensim-SC-6c3b7617b0356f093ef2730f1c517d6228997984.tar.gz opensim-SC-6c3b7617b0356f093ef2730f1c517d6228997984.tar.bz2 opensim-SC-6c3b7617b0356f093ef2730f1c517d6228997984.tar.xz |
Add lsClearWindlightScene() to the lightshare module to remove WL settings
from a region and allow normal day cycles to be reestablished
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 15 | ||||
-rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs | 3 |
5 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index 1da52b4..80ec65e 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
@@ -705,6 +705,9 @@ VALUES | |||
705 | //Return default LL windlight settings | 705 | //Return default LL windlight settings |
706 | return new RegionLightShareData(); | 706 | return new RegionLightShareData(); |
707 | } | 707 | } |
708 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
709 | { | ||
710 | } | ||
708 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 711 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
709 | { | 712 | { |
710 | //This connector doesn't support the windlight module yet | 713 | //This connector doesn't support the windlight module yet |
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index b53c67b..ae78814 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -965,6 +965,21 @@ namespace OpenSim.Data.MySQL | |||
965 | } | 965 | } |
966 | } | 966 | } |
967 | 967 | ||
968 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
969 | { | ||
970 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | ||
971 | { | ||
972 | dbcon.Open(); | ||
973 | |||
974 | using (MySqlCommand cmd = dbcon.CreateCommand()) | ||
975 | { | ||
976 | cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID"; | ||
977 | cmd.Parameters.AddWithValue("?regionID", regionID.ToString()); | ||
978 | ExecuteNonQuery(cmd); | ||
979 | } | ||
980 | } | ||
981 | } | ||
982 | |||
968 | public void StoreRegionSettings(RegionSettings rs) | 983 | public void StoreRegionSettings(RegionSettings rs) |
969 | { | 984 | { |
970 | lock (m_dbLock) | 985 | lock (m_dbLock) |
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index 34d3a4e..eb4e313 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
@@ -56,6 +56,9 @@ namespace OpenSim.Data.Null | |||
56 | //Return default LL windlight settings | 56 | //Return default LL windlight settings |
57 | return new RegionLightShareData(); | 57 | return new RegionLightShareData(); |
58 | } | 58 | } |
59 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
60 | { | ||
61 | } | ||
59 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 62 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
60 | { | 63 | { |
61 | //This connector doesn't support the windlight module yet | 64 | //This connector doesn't support the windlight module yet |
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 9d49fb6..bade0a1 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -323,6 +323,9 @@ namespace OpenSim.Data.SQLite | |||
323 | //Return default LL windlight settings | 323 | //Return default LL windlight settings |
324 | return new RegionLightShareData(); | 324 | return new RegionLightShareData(); |
325 | } | 325 | } |
326 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
327 | { | ||
328 | } | ||
326 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 329 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
327 | { | 330 | { |
328 | //This connector doesn't support the windlight module yet | 331 | //This connector doesn't support the windlight module yet |
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs index ce18a42..4952cdf 100644 --- a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs | |||
@@ -286,6 +286,9 @@ namespace OpenSim.Data.SQLiteLegacy | |||
286 | //Return default LL windlight settings | 286 | //Return default LL windlight settings |
287 | return new RegionLightShareData(); | 287 | return new RegionLightShareData(); |
288 | } | 288 | } |
289 | public void RemoveRegionWindlightSettings(UUID regionID) | ||
290 | { | ||
291 | } | ||
289 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 292 | public void StoreRegionWindlightSettings(RegionLightShareData wl) |
290 | { | 293 | { |
291 | //This connector doesn't support the windlight module yet | 294 | //This connector doesn't support the windlight module yet |