From 9707a2d57c4a4a8e818e0e9b0ec57c5b7abcb70c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jun 2012 18:24:02 +0100
Subject: Remove profile from basic configuration

---
 bin/config-include/Grid.ini       | 3 ---
 bin/config-include/Standalone.ini | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'bin')

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 @@
     SimulationServiceInConnector	= true
     LibraryModule					= true
 
-[Profile]
-    Module = "BasicProfileModule"
-
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
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 @@
     GridInfoServiceInConnector = true
     MapImageServiceInConnector = true
 
-[Profile]
-    Module = "BasicProfileModule"
-
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
-- 
cgit v1.1


From 008c6a4610fa7b710a9e2546cc09d9fee57e5795 Mon Sep 17 00:00:00 2001
From: Talun
Date: Fri, 1 Jun 2012 00:39:26 +0100
Subject: Mantis 4597 AgentPaused packet is ignored.

The packet was actually being handled but not acted on.
This change extends the default timeout for paused clients to 5 minutes
and makes both the paused and non-paused timeout periods configurable.
---
 bin/OpenSimDefaults.ini | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 27d86e8..c67e45a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -536,6 +536,19 @@
     ;
     ;DisableFacelights = false
 
+    ; The time to wait before disconecting an unresponsive client.
+    ; The time is in seconds. The default is one minute
+    ;
+    ;AckTimeout = 60
+
+    ; The time to wait before disconecting an unresponsive paused client.
+    ; A client can be paused when the file selection dialog is open during file upload.
+    ; This gives extra time to find files via the dialog but will still disconnect if
+    ; the client crashes or loses its network connection
+    ; The time is in seconds. The default is five minutes.
+    ;
+    ;PausedAckTimeout = 300
+
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
-- 
cgit v1.1