aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorDiva Canto2010-02-22 09:56:33 -0800
committerDiva Canto2010-02-22 09:56:33 -0800
commitde91a9e09bbb6c41eeb022540ae08952f413fb12 (patch)
treef4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Framework/RegionInfo.cs
parentDeleted duplicate [GridService] section. (diff)
parentMerge branch 'master' into presence-refactor (diff)
downloadopensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip
opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz
opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2
opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 0a826a6..ac38ac2 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -483,7 +483,6 @@ namespace OpenSim.Framework
483 else 483 else
484 m_externalHostName = externalName; 484 m_externalHostName = externalName;
485 485
486
487 m_regionType = config.GetString("RegionType", String.Empty); 486 m_regionType = config.GetString("RegionType", String.Empty);
488 487
489 // Prim stuff 488 // Prim stuff