aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-12-15 15:43:42 +0000
committerMelanie2009-12-15 15:43:42 +0000
commit9aea69a549df4a0e53641e0ddaaf657e4d1ba300 (patch)
tree4f58220e674170e5a90defc28545899b04b02fad /OpenSim
parentPrevent OSSL from crashing if the sim was loaded from a remote config and (diff)
parentChange default grid and inventory service ports in ConfigSettings to the ROBU... (diff)
downloadopensim-SC-9aea69a549df4a0e53641e0ddaaf657e4d1ba300.zip
opensim-SC-9aea69a549df4a0e53641e0ddaaf657e4d1ba300.tar.gz
opensim-SC-9aea69a549df4a0e53641e0ddaaf657e4d1ba300.tar.bz2
opensim-SC-9aea69a549df4a0e53641e0ddaaf657e4d1ba300.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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}