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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/World/Region/RestartModule.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-09-01 22:49:31 +01:00
parent aa7f4215a9 56f565b601
commit 008c98a974
25 changed files with 945 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -201,11 +201,11 @@ namespace OpenSim
envConfigSource.LoadEnv();
m_config.Source.Merge(envConfigSource);
m_config.Source.ExpandKeyValues();
}
ReadConfigSettings();
m_config.Source.ExpandKeyValues();
return m_config;
}