aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorTom2011-09-14 19:11:32 -0700
committerTom2011-09-14 19:11:32 -0700
commit5484c9b585a2a6289456e9492ac2989d489b555c (patch)
treec9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Data
parentMerge fixes, and fix the build (diff)
parentDon't try and delete attachments for child agent close (diff)
downloadopensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.zip
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz
Bring us up to date.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs1
-rw-r--r--OpenSim/Data/Null/NullSimulationData.cs4
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index b9228d1..3437250 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1209,7 +1209,6 @@ namespace OpenSim.Data.MySQL
1209 return prim; 1209 return prim;
1210 } 1210 }
1211 1211
1212
1213 /// <summary> 1212 /// <summary>
1214 /// Build a prim inventory item from the persisted data. 1213 /// Build a prim inventory item from the persisted data.
1215 /// </summary> 1214 /// </summary>
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index e8d733b..c33a6f2 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -59,19 +59,23 @@ namespace OpenSim.Data.Null
59 public void StoreRegionSettings(RegionSettings rs) 59 public void StoreRegionSettings(RegionSettings rs)
60 { 60 {
61 } 61 }
62
62 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) 63 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
63 { 64 {
64 //This connector doesn't support the windlight module yet 65 //This connector doesn't support the windlight module yet
65 //Return default LL windlight settings 66 //Return default LL windlight settings
66 return new RegionLightShareData(); 67 return new RegionLightShareData();
67 } 68 }
69
68 public void RemoveRegionWindlightSettings(UUID regionID) 70 public void RemoveRegionWindlightSettings(UUID regionID)
69 { 71 {
70 } 72 }
73
71 public void StoreRegionWindlightSettings(RegionLightShareData wl) 74 public void StoreRegionWindlightSettings(RegionLightShareData wl)
72 { 75 {
73 //This connector doesn't support the windlight module yet 76 //This connector doesn't support the windlight module yet
74 } 77 }
78
75 public RegionSettings LoadRegionSettings(UUID regionUUID) 79 public RegionSettings LoadRegionSettings(UUID regionUUID)
76 { 80 {
77 return null; 81 return null;