diff options
| author | Melanie | 2011-06-13 12:38:17 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-13 12:38:17 +0100 |
| commit | 9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f (patch) | |
| tree | 737d2847e8ea312e18ab96df2e2f6728e068381c /OpenSim/Services/Connectors/Hypergrid | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | match water color for warp3d map tiler and adjust lighting (diff) | |
| download | opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.zip opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.gz opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.bz2 opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 6ed8a3f..4ce406c 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -434,7 +434,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 434 | XmlRpcResponse response = null; | 434 | XmlRpcResponse response = null; |
| 435 | try | 435 | try |
| 436 | { | 436 | { |
| 437 | response = request.Send(m_ServerURL, 4000); | 437 | response = request.Send(m_ServerURL, 6000); |
| 438 | } | 438 | } |
| 439 | catch (Exception e) | 439 | catch (Exception e) |
| 440 | { | 440 | { |