aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-08-25 09:13:52 +0000
committerTeravus Ovares2008-08-25 09:13:52 +0000
commitc67c56ca94f61467948701c24c0879392c12846d (patch)
treea7ff1761b1d528a19dd69a67ce44789b8172863e /OpenSim
parent* This commit incorporates the heart of the OpenGridProtocol patch that is cu... (diff)
downloadopensim-SC_OLD-c67c56ca94f61467948701c24c0879392c12846d.zip
opensim-SC_OLD-c67c56ca94f61467948701c24c0879392c12846d.tar.gz
opensim-SC_OLD-c67c56ca94f61467948701c24c0879392c12846d.tar.bz2
opensim-SC_OLD-c67c56ca94f61467948701c24c0879392c12846d.tar.xz
* Fix to OGP Region to Region teleports. Yay.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index f6f0e8f..ffde9f2 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -551,8 +551,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
551 responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString()); 551 responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString());
552 responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_host).ToString()); 552 responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_host).ToString());
553 responseMap["sim_port"] = LLSD.FromInteger(rrPort); 553 responseMap["sim_port"] = LLSD.FromInteger(rrPort);
554 responseMap["region_x"] = LLSD.FromInteger(rrX * (int)Constants.RegionSize); 554 responseMap["region_x"] = LLSD.FromInteger(rrX );
555 responseMap["region_y"] = LLSD.FromInteger(rrY * (int)Constants.RegionSize); 555 responseMap["region_y"] = LLSD.FromInteger(rrY );
556 responseMap["region_id"] = LLSD.FromUUID(rrRID); 556 responseMap["region_id"] = LLSD.FromUUID(rrRID);
557 responseMap["sim_access"] = LLSD.FromString(rrAccess); 557 responseMap["sim_access"] = LLSD.FromString(rrAccess);
558 558