aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorDan Lake2013-07-18 13:33:50 -0700
committerDan Lake2013-07-18 13:33:50 -0700
commitedef7472d1060435334d7803728517d559a717e7 (patch)
tree99fe915fbda69feff5d2377abdb321bfae244088 /OpenSim/Data
parentChanged the timoeut of EQ 502s (no events) to 50 secs. The viewer post reques... (diff)
downloadopensim-SC-edef7472d1060435334d7803728517d559a717e7.zip
opensim-SC-edef7472d1060435334d7803728517d559a717e7.tar.gz
opensim-SC-edef7472d1060435334d7803728517d559a717e7.tar.bz2
opensim-SC-edef7472d1060435334d7803728517d559a717e7.tar.xz
Enable storing of environment settings in NullSimulationData
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/Null/NullSimulationData.cs20
1 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index 4979cf6..d11ad72 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -77,20 +77,34 @@ namespace OpenSim.Data.Null
77 } 77 }
78 78
79 #region Environment Settings 79 #region Environment Settings
80
81 private Dictionary<UUID, string> EnvironmentSettings = new Dictionary<UUID, string>();
82
80 public string LoadRegionEnvironmentSettings(UUID regionUUID) 83 public string LoadRegionEnvironmentSettings(UUID regionUUID)
81 { 84 {
82 //This connector doesn't support the Environment module yet 85 lock (EnvironmentSettings)
86 {
87 if (EnvironmentSettings.ContainsKey(regionUUID))
88 return EnvironmentSettings[regionUUID];
89 }
83 return string.Empty; 90 return string.Empty;
84 } 91 }
85 92
86 public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings) 93 public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
87 { 94 {
88 //This connector doesn't support the Environment module yet 95 lock (EnvironmentSettings)
96 {
97 EnvironmentSettings[regionUUID] = settings;
98 }
89 } 99 }
90 100
91 public void RemoveRegionEnvironmentSettings(UUID regionUUID) 101 public void RemoveRegionEnvironmentSettings(UUID regionUUID)
92 { 102 {
93 //This connector doesn't support the Environment module yet 103 lock (EnvironmentSettings)
104 {
105 if (EnvironmentSettings.ContainsKey(regionUUID))
106 EnvironmentSettings.Remove(regionUUID);
107 }
94 } 108 }
95 #endregion 109 #endregion
96 110