aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigSettings.cs
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:37:11 +0100
committerMelanie2011-10-25 01:37:11 +0100
commit9ceb98344a8a296994404edaf86b4344e06b9a69 (patch)
tree3efe288d54152c6b6b8c24e763495c1eddf62d4e /OpenSim/Framework/ConfigSettings.cs
parentMerge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge (diff)
parentGet rid of some traces of the old pre-ROBUST grid architecture config (diff)
downloadopensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.zip
opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.gz
opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.bz2
opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.xz
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
Diffstat (limited to 'OpenSim/Framework/ConfigSettings.cs')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 50328d7..b0bdebe 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -37,13 +37,6 @@ namespace OpenSim.Framework
37 public bool PhysicalPrim { get; set; } 37 public bool PhysicalPrim { get; set; }
38 public string LibrariesXMLFile { get; set; } 38 public string LibrariesXMLFile { get; set; }
39 39
40 public const uint DefaultAssetServerHttpPort = 8003;
41 public const uint DefaultRegionHttpPort = 9000; 40 public const uint DefaultRegionHttpPort = 9000;
42 public const uint DefaultUserServerHttpPort = 8002;
43 public const bool DefaultUserServerHttpSSL = false;
44 public const uint DefaultMessageServerHttpPort = 8006;
45 public const bool DefaultMessageServerHttpSSL = false;
46 public const uint DefaultGridServerHttpPort = 8003;
47 public const uint DefaultInventoryServerHttpPort = 8003;
48 } 41 }
49} \ No newline at end of file 42} \ No newline at end of file