diff options
author | Diva Canto | 2009-09-26 21:00:51 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-26 21:00:51 -0700 |
commit | f4bf581b96347b8d7f115eca74fa84a644eb729c (patch) | |
tree | c1e42376edb8d2e5a6094854dd1ac4320f0c6f23 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion | |
parent | Fixed a bug with link-region. (diff) | |
download | opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.zip opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.tar.gz opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.tar.bz2 opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.tar.xz |
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
Fixed small bugs with hyperlinked regions' map positions.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index adf747a..696225c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |||
@@ -824,29 +824,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
824 | 824 | ||
825 | public override void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit) | 825 | public override void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit) |
826 | { | 826 | { |
827 | try | 827 | if (m_hyperlinkService != null) |
828 | { | 828 | m_hyperlinkService.SendUserInformation(regInfo, aCircuit); |
829 | if (m_aScene.SceneGridService is HGSceneCommunicationService) | ||
830 | { | ||
831 | // big hack for now | ||
832 | RegionInfo r = new RegionInfo(); | ||
833 | r.ExternalHostName = regInfo.ExternalHostName; | ||
834 | r.HttpPort = regInfo.HttpPort; | ||
835 | r.RegionID = regInfo.RegionID; | ||
836 | r.RegionLocX = (uint)regInfo.RegionLocX; | ||
837 | r.RegionLocY = (uint)regInfo.RegionLocY; | ||
838 | ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.SendUserInformation(r, aCircuit); | ||
839 | } | ||
840 | } | ||
841 | catch // Bad cast | ||
842 | { } | ||
843 | 829 | ||
844 | } | 830 | } |
845 | 831 | ||
846 | public override void AdjustUserInformation(AgentCircuitData aCircuit) | 832 | public override void AdjustUserInformation(AgentCircuitData aCircuit) |
847 | { | 833 | { |
848 | if (m_aScene.SceneGridService is HGSceneCommunicationService) | 834 | if (m_hyperlinkService != null) |
849 | ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.AdjustUserInformation(aCircuit); | 835 | m_hyperlinkService.AdjustUserInformation(aCircuit); |
850 | } | 836 | } |
851 | } | 837 | } |
852 | 838 | ||