diff options
author | dahlia | 2010-10-20 20:43:08 -0700 |
---|---|---|
committer | dahlia | 2010-10-20 20:43:08 -0700 |
commit | f8a47801ee9421282eb3abc3e89a465fc71f6930 (patch) | |
tree | 1309c1db63355ee56f719e0fabe81278f3ef47b4 /OpenSim/Server | |
parent | fix combining of multiple physics submeshes (diff) | |
parent | * remove some spurious debug info (diff) | |
download | opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.zip opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.gz opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.bz2 opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.xz |
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index f64a079..a1bcba6 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -124,6 +124,7 @@ 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; | ||
127 | int gatekeeper_port = 0; | 128 | int gatekeeper_port = 0; |
128 | IPEndPoint client_ipaddress = null; | 129 | IPEndPoint client_ipaddress = null; |
129 | 130 | ||
@@ -173,6 +174,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
173 | destination.RegionLocX = x; | 174 | destination.RegionLocX = x; |
174 | destination.RegionLocY = y; | 175 | destination.RegionLocY = y; |
175 | destination.RegionName = regionname; | 176 | destination.RegionName = regionname; |
177 | |||
176 | 178 | ||
177 | AgentCircuitData aCircuit = new AgentCircuitData(); | 179 | AgentCircuitData aCircuit = new AgentCircuitData(); |
178 | try | 180 | try |