diff options
author | UbitUmarov | 2017-06-10 02:48:51 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-10 02:48:51 +0100 |
commit | b5910cfdb7461d523e2dc34dc9f33fe096766525 (patch) | |
tree | c8fa1bfd77c9b77f636117b953422f2cf66c0c07 /bin | |
parent | Merge branch 'master' into httptests (diff) | |
parent | add a adicional in transit flag to signal HG tps, and use it to ignore userna... (diff) | |
download | opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.zip opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.gz opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.bz2 opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.xz |
merge
Diffstat (limited to 'bin')
-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 3482270..f1dcbd3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -138,7 +138,7 @@ | |||
138 | ;; The XML here has the same format as it does on the filesystem | 138 | ;; The XML here has the same format as it does on the filesystem |
139 | ;; (including the <Root> tag), except that everything is also enclosed | 139 | ;; (including the <Root> tag), except that everything is also enclosed |
140 | ;; in a <Regions> tag. | 140 | ;; in a <Regions> tag. |
141 | ; regionload_webserver_url = "http://example.com/regions.xml"; | 141 | ; regionload_webserver_url = "http://example.com/regions.xml" |
142 | 142 | ||
143 | ;# {allow_regionless} {} {Allow simulator to start up with no regions configured.} {true false} false | 143 | ;# {allow_regionless} {} {Allow simulator to start up with no regions configured.} {true false} false |
144 | ;; Allow the simulator to start up if there are no region configuration available | 144 | ;; Allow the simulator to start up if there are no region configuration available |
@@ -286,8 +286,8 @@ | |||
286 | ;; SpawnPointRouting adjusts the landing for incoming avatars. | 286 | ;; SpawnPointRouting adjusts the landing for incoming avatars. |
287 | ;; "closest" will place the avatar at the SpawnPoint located in the closest | 287 | ;; "closest" will place the avatar at the SpawnPoint located in the closest |
288 | ;; available spot to the destination (typically map click/landmark). | 288 | ;; available spot to the destination (typically map click/landmark). |
289 | ;; "random" will place the avatar on a randomly selected spawnpoint; | 289 | ;; "random" will place the avatar on a randomly selected spawnpoint. |
290 | ;; "sequence" will place the avatar on the next sequential SpawnPoint | 290 | ;; "sequence" will place the avatar on the next sequential SpawnPoint. |
291 | ; SpawnPointRouting = closest | 291 | ; SpawnPointRouting = closest |
292 | 292 | ||
293 | ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false | 293 | ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false |
@@ -375,8 +375,8 @@ | |||
375 | ; TexturePrimSize = 48 | 375 | ; TexturePrimSize = 48 |
376 | 376 | ||
377 | ;# {RenderMeshes} {} {Render meshes and sculpties on map tiles?} {true false} false | 377 | ;# {RenderMeshes} {} {Render meshes and sculpties on map tiles?} {true false} false |
378 | ;; Attempt to render meshes and sculpties on the map | 378 | ;; Attempt to render meshes and sculpties on the map. |
379 | ; RenderMeshes = false; | 379 | ; RenderMeshes = false |
380 | 380 | ||
381 | 381 | ||
382 | [Permissions] | 382 | [Permissions] |
@@ -585,7 +585,7 @@ | |||
585 | ;; web server | 585 | ;; web server |
586 | ; user_agent = "OpenSim LSL (Mozilla Compatible)" | 586 | ; user_agent = "OpenSim LSL (Mozilla Compatible)" |
587 | 587 | ||
588 | ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services. | 588 | ;; The following 3 variables are for HTTP Basic Authentication for the Robust services. |
589 | ;; Use this if your central services in port 8003 need to be accessible on the Internet | 589 | ;; Use this if your central services in port 8003 need to be accessible on the Internet |
590 | ;; but you want to protect them from unauthorized access. The username and password | 590 | ;; but you want to protect them from unauthorized access. The username and password |
591 | ;; here need to match the ones in the Robust service configuration. | 591 | ;; here need to match the ones in the Robust service configuration. |
@@ -650,7 +650,6 @@ | |||
650 | 650 | ||
651 | 651 | ||
652 | [SimulatorFeatures] | 652 | [SimulatorFeatures] |
653 | |||
654 | ;# {SearchServerURI} {} {URL of the search server} {} | 653 | ;# {SearchServerURI} {} {URL of the search server} {} |
655 | ;; Optional. If given this serves the same purpose as the grid wide | 654 | ;; Optional. If given this serves the same purpose as the grid wide |
656 | ;; [LoginServices] SearchURL setting and will override that where | 655 | ;; [LoginServices] SearchURL setting and will override that where |
@@ -707,7 +706,7 @@ | |||
707 | ;; For standalones, this is the storage dll. | 706 | ;; For standalones, this is the storage dll. |
708 | ; StorageProvider = OpenSim.Data.MySQL.dll | 707 | ; StorageProvider = OpenSim.Data.MySQL.dll |
709 | 708 | ||
710 | ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule | 709 | ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} None |
711 | ;; Mute list handler (not yet implemented). MUST BE SET to allow offline | 710 | ;; Mute list handler (not yet implemented). MUST BE SET to allow offline |
712 | ;; messages to work | 711 | ;; messages to work |
713 | ; MuteListModule = MuteListModule | 712 | ; MuteListModule = MuteListModule |
@@ -1163,7 +1162,7 @@ | |||
1163 | [MediaOnAPrim] | 1162 | [MediaOnAPrim] |
1164 | ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true | 1163 | ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true |
1165 | ;; Enable media on a prim facilities | 1164 | ;; Enable media on a prim facilities |
1166 | ; Enabled = true; | 1165 | ; Enabled = true |
1167 | 1166 | ||
1168 | 1167 | ||
1169 | [NPC] | 1168 | [NPC] |