From 8ac4ec738bfb940323cab6dcd001ec22163c907e Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 4 May 2009 01:57:18 +0000 Subject: Create a working configuration hook to allow LLClient parameters from Opensim.ini to take force --- OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++-- OpenSim/Region/Framework/Scenes/SceneBase.cs | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5270d11..9f99305 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -136,9 +136,9 @@ namespace OpenSim.Region.Framework.Scenes get { return m_capsModule; } } - public IConfigSource Config + protected override IConfigSource GetConfig() { - get { return m_config; } + return m_config; } // Central Update Loop diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index c317c2a..9d8582f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -53,7 +53,12 @@ namespace OpenSim.Region.Framework.Scenes public IConfigSource Config { - get { return null; } + get { return GetConfig(); } + } + + protected virtual IConfigSource GetConfig() + { + return null; } /// -- cgit v1.1