diff options
| author | Melanie | 2010-10-21 07:33:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 07:33:01 +0100 |
| commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
| tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Server | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| parent | Skip empty strings in ParseString* functions (diff) | |
| download | opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.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, 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 |