aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-06-30 14:09:19 +0000
committerCharles Krinke2008-06-30 14:09:19 +0000
commit4cb42d4c3596845ab8afd076c5e742de4685df91 (patch)
treeb59e6647b850f04b70ed38ac0d4c17f87acfc3ba /OpenSim/Framework/RegionInfo.cs
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-4cb42d4c3596845ab8afd076c5e742de4685df91.zip
opensim-SC_OLD-4cb42d4c3596845ab8afd076c5e742de4685df91.tar.gz
opensim-SC_OLD-4cb42d4c3596845ab8afd076c5e742de4685df91.tar.bz2
opensim-SC_OLD-4cb42d4c3596845ab8afd076c5e742de4685df91.tar.xz
Mantis#1637. Thank you kindly, Melanie for a patch that:
Make each region load it's settings from the database on startup. No user functionality yet.
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs18
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index f10f25d..924a566 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -197,6 +197,7 @@ namespace OpenSim.Framework
197 public string DataStore = String.Empty; 197 public string DataStore = String.Empty;
198 public bool isSandbox = false; 198 public bool isSandbox = false;
199 private EstateSettings m_estateSettings; 199 private EstateSettings m_estateSettings;
200 private RegionSettings m_regionSettings;
200 201
201// public bool m_allow_alternate_ports; 202// public bool m_allow_alternate_ports;
202 203
@@ -280,6 +281,21 @@ namespace OpenSim.Framework
280 } 281 }
281 } 282 }
282 283
284 public RegionSettings RegionSettings
285 {
286 get
287 {
288 if(m_regionSettings == null)
289 {
290 m_regionSettings = new RegionSettings();
291 }
292
293 return m_regionSettings;
294 }
295
296 set { m_regionSettings = value; }
297 }
298
283 public void SetEndPoint(string ipaddr, int port) 299 public void SetEndPoint(string ipaddr, int port)
284 { 300 {
285 IPAddress tmpIP = IPAddress.Parse(ipaddr); 301 IPAddress tmpIP = IPAddress.Parse(ipaddr);
@@ -560,4 +576,4 @@ namespace OpenSim.Framework
560 configMember.forceSetConfigurationOption("lastmap_refresh", lastMapRefresh); 576 configMember.forceSetConfigurationOption("lastmap_refresh", lastMapRefresh);
561 } 577 }
562 } 578 }
563} \ No newline at end of file 579}