ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
This commit is contained in:
Melanie
2013-07-24 03:50:09 +01:00
parent 437326a480 9041f4a056
commit a7eb1b5b85
31 changed files with 656 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Data/Null/NullSimulationData.cs
View File

@@ -77,20 +77,34 @@ namespace OpenSim.Data.Null
}
#region Environment Settings
private Dictionary<UUID, string> EnvironmentSettings = new Dictionary<UUID, string>();
public string LoadRegionEnvironmentSettings(UUID regionUUID)
{
//This connector doesn't support the Environment module yet
lock (EnvironmentSettings)
{
if (EnvironmentSettings.ContainsKey(regionUUID))
return EnvironmentSettings[regionUUID];
}
return string.Empty;
}
public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
{
//This connector doesn't support the Environment module yet
lock (EnvironmentSettings)
{
EnvironmentSettings[regionUUID] = settings;
}
}
public void RemoveRegionEnvironmentSettings(UUID regionUUID)
{
//This connector doesn't support the Environment module yet
lock (EnvironmentSettings)
{
if (EnvironmentSettings.ContainsKey(regionUUID))
EnvironmentSettings.Remove(regionUUID);
}
}
#endregion