aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteRegionData.cs
diff options
context:
space:
mode:
authorMelanie2009-12-09 16:57:35 +0000
committerMelanie2009-12-09 16:57:35 +0000
commit2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a (patch)
treeccd2cf3ac694ae28f27d0949bc761b8c6314ef99 /OpenSim/Data/SQLite/SQLiteRegionData.cs
parentMerge branch 'master' into careminster (diff)
parentLast bits and bobs to clean up the Meta7WindlightModule (diff)
downloadopensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.zip
opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.tar.gz
opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.tar.bz2
opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.tar.xz
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b68de1a..f1c1f78 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -272,7 +272,16 @@ namespace OpenSim.Data.SQLite
272 Commit(); 272 Commit();
273 } 273 }
274 } 274 }
275 275 public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
276 {
277 //This connector doesn't support the windlight module yet
278 //Return default LL windlight settings
279 return new RegionMeta7WindlightData();
280 }
281 public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
282 {
283 //This connector doesn't support the windlight module yet
284 }
276 public RegionSettings LoadRegionSettings(UUID regionUUID) 285 public RegionSettings LoadRegionSettings(UUID regionUUID)
277 { 286 {
278 lock (ds) 287 lock (ds)