diff options
author | Melanie | 2012-05-27 19:24:30 +0100 |
---|---|---|
committer | Melanie | 2012-05-27 19:24:30 +0100 |
commit | 884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f (patch) | |
tree | dd692a54213f86fd64bd29c6662584df85088193 /OpenSim/Data/Null | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: code formatting from 0b72f773 (diff) | |
download | opensim-SC_OLD-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.zip opensim-SC_OLD-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.tar.gz opensim-SC_OLD-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.tar.bz2 opensim-SC_OLD-884c0e7bb10bd2c2a951901c6f1dd56a86ef6b9f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'OpenSim/Data/Null')
-rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index b788976..8f2314f 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
@@ -76,9 +76,27 @@ namespace OpenSim.Data.Null | |||
76 | //This connector doesn't support the windlight module yet | 76 | //This connector doesn't support the windlight module yet |
77 | } | 77 | } |
78 | 78 | ||
79 | #region Environment Settings | ||
80 | public string LoadRegionEnvironmentSettings(UUID regionUUID) | ||
81 | { | ||
82 | //This connector doesn't support the Environment module yet | ||
83 | return string.Empty; | ||
84 | } | ||
85 | |||
86 | public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings) | ||
87 | { | ||
88 | //This connector doesn't support the Environment module yet | ||
89 | } | ||
90 | |||
91 | public void RemoveRegionEnvironmentSettings(UUID regionUUID) | ||
92 | { | ||
93 | //This connector doesn't support the Environment module yet | ||
94 | } | ||
95 | #endregion | ||
96 | |||
79 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 97 | public RegionSettings LoadRegionSettings(UUID regionUUID) |
80 | { | 98 | { |
81 | RegionSettings rs = new RegionSettings(); | 99 | RegionSettings rs = new RegionSettings(); |
82 | rs.RegionUUID = regionUUID; | 100 | rs.RegionUUID = regionUUID; |
83 | return rs; | 101 | return rs; |
84 | } | 102 | } |