aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-15 15:46:18 +0000
committerMelanie2009-12-15 15:46:18 +0000
commitf8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a (patch)
tree2304fc33d0b0aca36cc5acff1298d649ae03315e /OpenSim/Framework
parentMerge branch 'master' into tests (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.zip
opensim-SC-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.tar.gz
opensim-SC-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.tar.bz2
opensim-SC-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 93efffa..32415e0 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
168 public const bool DefaultUserServerHttpSSL = false; 168 public const bool DefaultUserServerHttpSSL = false;
169 public const uint DefaultMessageServerHttpPort = 8006; 169 public const uint DefaultMessageServerHttpPort = 8006;
170 public const bool DefaultMessageServerHttpSSL = false; 170 public const bool DefaultMessageServerHttpSSL = false;
171 public const uint DefaultGridServerHttpPort = 8001; 171 public const uint DefaultGridServerHttpPort = 8003;
172 public const uint DefaultInventoryServerHttpPort = 8004; 172 public const uint DefaultInventoryServerHttpPort = 8003;
173 } 173 }
174} 174}