diff options
author | Melanie Thielker | 2009-05-04 01:57:18 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-04 01:57:18 +0000 |
commit | 8ac4ec738bfb940323cab6dcd001ec22163c907e (patch) | |
tree | 2881b6dcbdf4a7fa1397d5ee942491fc154fc086 /OpenSim/Region/Framework | |
parent | Some reorganization around service connectors. No functional change (diff) | |
download | opensim-SC-8ac4ec738bfb940323cab6dcd001ec22163c907e.zip opensim-SC-8ac4ec738bfb940323cab6dcd001ec22163c907e.tar.gz opensim-SC-8ac4ec738bfb940323cab6dcd001ec22163c907e.tar.bz2 opensim-SC-8ac4ec738bfb940323cab6dcd001ec22163c907e.tar.xz |
Create a working configuration hook to allow LLClient parameters from
Opensim.ini to take force
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 7 |
2 files changed, 8 insertions, 3 deletions
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 | |||
136 | get { return m_capsModule; } | 136 | get { return m_capsModule; } |
137 | } | 137 | } |
138 | 138 | ||
139 | public IConfigSource Config | 139 | protected override IConfigSource GetConfig() |
140 | { | 140 | { |
141 | get { return m_config; } | 141 | return m_config; |
142 | } | 142 | } |
143 | 143 | ||
144 | // Central Update Loop | 144 | // 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 | |||
53 | 53 | ||
54 | public IConfigSource Config | 54 | public IConfigSource Config |
55 | { | 55 | { |
56 | get { return null; } | 56 | get { return GetConfig(); } |
57 | } | ||
58 | |||
59 | protected virtual IConfigSource GetConfig() | ||
60 | { | ||
61 | return null; | ||
57 | } | 62 | } |
58 | 63 | ||
59 | /// <value> | 64 | /// <value> |