diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/OpenSim.ini.example | 5 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 9 | ||||
-rw-r--r-- | bin/pCampBot.exe.config | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 9f418a4..aa29c07 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -249,6 +249,11 @@ | |||
249 | ;; "sequence" will place the avatar on the next sequential SpawnPoint | 249 | ;; "sequence" will place the avatar on the next sequential SpawnPoint |
250 | ; SpawnPointRouting = closest | 250 | ; SpawnPointRouting = closest |
251 | 251 | ||
252 | ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false | ||
253 | ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true | ||
254 | ;; default is false | ||
255 | ; TelehubAllowLandmark = false | ||
256 | |||
252 | [Estates] | 257 | [Estates] |
253 | ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). | 258 | ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). |
254 | ; If these values are uncommented then they will be used to create a default estate as necessary. | 259 | ; If these values are uncommented then they will be used to create a default estate as necessary. |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d159960..ea83f91 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -601,13 +601,12 @@ | |||
601 | Cap_ViewerStartAuction = "" | 601 | Cap_ViewerStartAuction = "" |
602 | Cap_ViewerStats = "" | 602 | Cap_ViewerStats = "" |
603 | 603 | ||
604 | ; The various fetch inventory caps are supported by OpenSim, but may | 604 | ; Capabilities for fetching inventory over HTTP rather than UDP |
605 | ; lead to poor sim performance if served by the simulators, | ||
606 | ; so they are currently disabled by default. | ||
607 | ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) | 605 | ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) |
606 | ; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled | ||
608 | Cap_WebFetchInventoryDescendents = "" | 607 | Cap_WebFetchInventoryDescendents = "" |
609 | Cap_FetchInventoryDescendents2 = "" | 608 | Cap_FetchInventoryDescendents2 = "localhost" |
610 | Cap_FetchInventory2 = "" | 609 | Cap_FetchInventory2 = "localhost" |
611 | 610 | ||
612 | 611 | ||
613 | [Chat] | 612 | [Chat] |
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config index 3f19ee8..9cfb7e9 100644 --- a/bin/pCampBot.exe.config +++ b/bin/pCampBot.exe.config | |||
@@ -8,7 +8,7 @@ | |||
8 | <log4net> | 8 | <log4net> |
9 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 9 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
10 | <layout type="log4net.Layout.PatternLayout"> | 10 | <layout type="log4net.Layout.PatternLayout"> |
11 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | 11 | <conversionPattern value="%date{HH:mm:ss.fff} - %message%newline" /> |
12 | </layout> | 12 | </layout> |
13 | </appender> | 13 | </appender> |
14 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 14 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |