diff options
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSimDefaults.ini | 13 | ||||
-rw-r--r-- | bin/config-include/Grid.ini | 3 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a38a3d0..9afac3f 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -536,6 +536,19 @@ | |||
536 | ; | 536 | ; |
537 | ;DisableFacelights = false | 537 | ;DisableFacelights = false |
538 | 538 | ||
539 | ; The time to wait before disconecting an unresponsive client. | ||
540 | ; The time is in seconds. The default is one minute | ||
541 | ; | ||
542 | ;AckTimeout = 60 | ||
543 | |||
544 | ; The time to wait before disconecting an unresponsive paused client. | ||
545 | ; A client can be paused when the file selection dialog is open during file upload. | ||
546 | ; This gives extra time to find files via the dialog but will still disconnect if | ||
547 | ; the client crashes or loses its network connection | ||
548 | ; The time is in seconds. The default is five minutes. | ||
549 | ; | ||
550 | ;PausedAckTimeout = 300 | ||
551 | |||
539 | [ClientStack.LindenCaps] | 552 | [ClientStack.LindenCaps] |
540 | ;; Long list of capabilities taken from | 553 | ;; Long list of capabilities taken from |
541 | ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities | 554 | ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities |
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 95d6264..cb3a5c8 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -29,9 +29,6 @@ | |||
29 | SimulationServiceInConnector = true | 29 | SimulationServiceInConnector = true |
30 | LibraryModule = true | 30 | LibraryModule = true |
31 | 31 | ||
32 | [Profile] | ||
33 | Module = "BasicProfileModule" | ||
34 | |||
35 | [SimulationDataStore] | 32 | [SimulationDataStore] |
36 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 33 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
37 | 34 | ||
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 74d9d2e..ba72fe7 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -25,9 +25,6 @@ | |||
25 | GridInfoServiceInConnector = true | 25 | GridInfoServiceInConnector = true |
26 | MapImageServiceInConnector = true | 26 | MapImageServiceInConnector = true |
27 | 27 | ||
28 | [Profile] | ||
29 | Module = "BasicProfileModule" | ||
30 | |||
31 | [SimulationDataStore] | 28 | [SimulationDataStore] |
32 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 29 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
33 | 30 | ||