diff options
| author | Melanie | 2009-10-08 08:07:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 08:07:38 +0100 |
| commit | fe679be9e76190ac0dc8892469787e63a7a48b5c (patch) | |
| tree | 220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Framework/ConfigSettings.cs | |
| parent | store owner_uuid in the region table (diff) | |
| parent | One last attempt at tunning the locking/no locking behaviour. The previous on... (diff) | |
| download | opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2 opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz | |
Merge branch 'htb-throttle'
Diffstat (limited to 'OpenSim/Framework/ConfigSettings.cs')
| -rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 32415e0..93efffa 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 = 8003; | 171 | public const uint DefaultGridServerHttpPort = 8001; |
| 172 | public const uint DefaultInventoryServerHttpPort = 8003; | 172 | public const uint DefaultInventoryServerHttpPort = 8004; |
| 173 | } | 173 | } |
| 174 | } | 174 | } |