diff options
| author | UbitUmarov | 2015-11-12 23:04:04 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-12 23:04:04 +0000 |
| commit | f037f8335ecb798fff15edd4c2e520d662f48002 (patch) | |
| tree | 5ab9ac0c61b21206dd1288a924e369e247cedb63 /bin/OpenSim.ini.example | |
| parent | minor: reset character collision flags, even if without a Body (diff) | |
| parent | Corrections to ini example files for standalones v2 (diff) | |
| download | opensim-SC-f037f8335ecb798fff15edd4c2e520d662f48002.zip opensim-SC-f037f8335ecb798fff15edd4c2e520d662f48002.tar.gz opensim-SC-f037f8335ecb798fff15edd4c2e520d662f48002.tar.bz2 opensim-SC-f037f8335ecb798fff15edd4c2e520d662f48002.tar.xz | |
Merge branch 'master' into avinationmerge
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 323a1e9..e4adb7f 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -610,17 +610,16 @@ | |||
| 610 | [SimulatorFeatures] | 610 | [SimulatorFeatures] |
| 611 | 611 | ||
| 612 | ;# {SearchServerURI} {} {URL of the search server} {} | 612 | ;# {SearchServerURI} {} {URL of the search server} {} |
| 613 | ;; This is identical to the Robust LoginService SearchURL setting | 613 | ;; Optional. If given this serves the same purpose as the grid wide |
| 614 | ;; and will override that value if set here. The Robust setting | 614 | ;; [LoginServices] SearchURL setting and will override that where |
| 615 | ;; provides a working default for the grid and setting here is | 615 | ;; supported by viewers. |
| 616 | ;; optional. | ||
| 617 | ;SearchServerURI = "http://127.0.0.1:9000/" | 616 | ;SearchServerURI = "http://127.0.0.1:9000/" |
| 617 | |||
| 618 | ;# {DestinationGuideURI} {} {URL of the destination guide} {} | 618 | ;# {DestinationGuideURI} {} {URL of the destination guide} {} |
| 619 | ;; | 619 | ;; Optional. If given this serves the same purpose as the grid wide |
| 620 | ;; This serves the same purpose as the DestinationGuideURI in the | 620 | ;; [LoginServices] DestinationGuide setting and will override that where |
| 621 | ;; LoginService setting in the Robust server. This will override | 621 | ;; supported by viewers. |
| 622 | ;; the Robust setting if desired as an option. | 622 | ;DestinationGuideURI = "http://127.0.0.1:9000/guide" |
| 623 | ;DestinationGuideURI = "http://127.0.0.1:9000/" | ||
| 624 | 623 | ||
| 625 | 624 | ||
| 626 | [Chat] | 625 | [Chat] |