aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2011-06-11 17:22:35 -0700
committerDiva Canto2011-06-11 17:22:35 -0700
commite1ca77a0dbc68431131b0505f03cf45dbfe5b7d9 (patch)
tree55c64a65738ce100bc2bcf4ff7a8e911baa71942 /OpenSim/Services
parentSwitched order of SQL statements in Friends migration -- resulted in the wron... (diff)
downloadopensim-SC_OLD-e1ca77a0dbc68431131b0505f03cf45dbfe5b7d9.zip
opensim-SC_OLD-e1ca77a0dbc68431131b0505f03cf45dbfe5b7d9.tar.gz
opensim-SC_OLD-e1ca77a0dbc68431131b0505f03cf45dbfe5b7d9.tar.bz2
opensim-SC_OLD-e1ca77a0dbc68431131b0505f03cf45dbfe5b7d9.tar.xz
Only send AgentOnline to the client if the friendsOnline list has elements. Also, increased the timeout on UserAgentServiceConnector, StatusNotification again.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 2a5fb40..6265bcd 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -436,7 +436,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
436 XmlRpcResponse response = null; 436 XmlRpcResponse response = null;
437 try 437 try
438 { 438 {
439 response = request.Send(m_ServerURL, 4000); 439 response = request.Send(m_ServerURL, 6000);
440 } 440 }
441 catch (Exception e) 441 catch (Exception e)
442 { 442 {