diff options
author | John Hurliman | 2010-04-02 13:32:40 -0700 |
---|---|---|
committer | John Hurliman | 2010-04-02 13:32:40 -0700 |
commit | a895de4414fa3a9439500a2bbbb18d4bc24fa624 (patch) | |
tree | 5adccfbbd91fceb4366c82e71a786270a95c1653 /OpenSim/Data/SQLite/SQLiteRegionData.cs | |
parent | * Better logging for Authenticate() failures (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-a895de4414fa3a9439500a2bbbb18d4bc24fa624.zip opensim-SC_OLD-a895de4414fa3a9439500a2bbbb18d4bc24fa624.tar.gz opensim-SC_OLD-a895de4414fa3a9439500a2bbbb18d4bc24fa624.tar.bz2 opensim-SC_OLD-a895de4414fa3a9439500a2bbbb18d4bc24fa624.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteRegionData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 5a4ee2a..d2ba9ae 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 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | |
276 | { | ||
277 | //This connector doesn't support the windlight module yet | ||
278 | //Return default LL windlight settings | ||
279 | return new RegionLightShareData(); | ||
280 | } | ||
281 | public void StoreRegionWindlightSettings(RegionLightShareData 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) |
@@ -320,7 +329,7 @@ namespace OpenSim.Data.SQLite | |||
320 | { | 329 | { |
321 | foreach (SceneObjectPart prim in obj.Children.Values) | 330 | foreach (SceneObjectPart prim in obj.Children.Values) |
322 | { | 331 | { |
323 | m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 332 | // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
324 | addPrim(prim, obj.UUID, regionUUID); | 333 | addPrim(prim, obj.UUID, regionUUID); |
325 | } | 334 | } |
326 | } | 335 | } |