diff options
| author | Melanie | 2010-10-23 00:21:42 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-23 00:21:42 +0100 |
| commit | 7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e (patch) | |
| tree | 73f156f1f7dc7d199a946d351828c7e725ebfbda /OpenSim/Server | |
| parent | Change some exception to use ToString(). e.Message is not sufficient to fix (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.zip opensim-SC-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.gz opensim-SC-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.bz2 opensim-SC-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index a1bcba6..f64a079 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
| @@ -124,7 +124,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 124 | UUID uuid = UUID.Zero; | 124 | UUID uuid = UUID.Zero; |
| 125 | string regionname = string.Empty; | 125 | string regionname = string.Empty; |
| 126 | string gatekeeper_host = string.Empty; | 126 | string gatekeeper_host = string.Empty; |
| 127 | string server_uri = string.Empty; | ||
| 128 | int gatekeeper_port = 0; | 127 | int gatekeeper_port = 0; |
| 129 | IPEndPoint client_ipaddress = null; | 128 | IPEndPoint client_ipaddress = null; |
| 130 | 129 | ||
| @@ -174,7 +173,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 174 | destination.RegionLocX = x; | 173 | destination.RegionLocX = x; |
| 175 | destination.RegionLocY = y; | 174 | destination.RegionLocY = y; |
| 176 | destination.RegionName = regionname; | 175 | destination.RegionName = regionname; |
| 177 | |||
| 178 | 176 | ||
| 179 | AgentCircuitData aCircuit = new AgentCircuitData(); | 177 | AgentCircuitData aCircuit = new AgentCircuitData(); |
| 180 | try | 178 | try |