diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /bin/Robust.ini.example | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/Robust.ini.example')
| -rw-r--r-- | bin/Robust.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index cc018f8..5d0ec09 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -21,7 +21,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 21 | [Network] | 21 | [Network] |
| 22 | port = 8003 | 22 | port = 8003 |
| 23 | 23 | ||
| 24 | |||
| 25 | ; HTTPS for "Out of band" management applications such as the remote admin | 24 | ; HTTPS for "Out of band" management applications such as the remote admin |
| 26 | ; module. May specify https_main = True to make the main http server | 25 | ; module. May specify https_main = True to make the main http server |
| 27 | ; use https or "False" to make the main server HTTP | 26 | ; use https or "False" to make the main server HTTP |
| @@ -92,6 +91,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 92 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | 91 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" |
| 93 | 92 | ||
| 94 | ;; The IP address of your FreeSWITCH server. | 93 | ;; The IP address of your FreeSWITCH server. |
| 94 | ;; This address must be reachable by viewers. | ||
| 95 | ; ServerAddress = 127.0.0.1 | 95 | ; ServerAddress = 127.0.0.1 |
| 96 | 96 | ||
| 97 | ;; The following configuration parameters are optional | 97 | ;; The following configuration parameters are optional |