diff options
author | Diva Canto | 2010-01-24 14:30:48 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-24 14:30:48 -0800 |
commit | 48b03c2c61a422c3ac9843892a2ae93b29a9f7b8 (patch) | |
tree | ce3aae8c5bb0ee0c1748e4355cd616ea84b5b344 /OpenSim/Services/GridService/GridService.cs | |
parent | Change a member of the friendslist module to better reflect the client side (diff) | |
download | opensim-SC_OLD-48b03c2c61a422c3ac9843892a2ae93b29a9f7b8.zip opensim-SC_OLD-48b03c2c61a422c3ac9843892a2ae93b29a9f7b8.tar.gz opensim-SC_OLD-48b03c2c61a422c3ac9843892a2ae93b29a9f7b8.tar.bz2 opensim-SC_OLD-48b03c2c61a422c3ac9843892a2ae93b29a9f7b8.tar.xz |
Integrated the hyperlinking with the GridService.
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 9e0790c..ae29a74 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -50,6 +50,7 @@ namespace OpenSim.Services.GridService | |||
50 | private bool m_DeleteOnUnregister = true; | 50 | private bool m_DeleteOnUnregister = true; |
51 | private static GridService m_RootInstance = null; | 51 | private static GridService m_RootInstance = null; |
52 | protected IConfigSource m_config; | 52 | protected IConfigSource m_config; |
53 | protected HypergridLinker m_HypergridLinker; | ||
53 | 54 | ||
54 | protected IAuthenticationService m_AuthenticationService = null; | 55 | protected IAuthenticationService m_AuthenticationService = null; |
55 | protected bool m_AllowDuplicateNames = false; | 56 | protected bool m_AllowDuplicateNames = false; |
@@ -92,6 +93,8 @@ namespace OpenSim.Services.GridService | |||
92 | "Set database flags for region", | 93 | "Set database flags for region", |
93 | String.Empty, | 94 | String.Empty, |
94 | HandleSetFlags); | 95 | HandleSetFlags); |
96 | |||
97 | m_HypergridLinker = new HypergridLinker(m_config, this, m_Database); | ||
95 | } | 98 | } |
96 | } | 99 | } |
97 | 100 | ||
@@ -346,7 +349,7 @@ namespace OpenSim.Services.GridService | |||
346 | 349 | ||
347 | #region Data structure conversions | 350 | #region Data structure conversions |
348 | 351 | ||
349 | protected RegionData RegionInfo2RegionData(GridRegion rinfo) | 352 | public RegionData RegionInfo2RegionData(GridRegion rinfo) |
350 | { | 353 | { |
351 | RegionData rdata = new RegionData(); | 354 | RegionData rdata = new RegionData(); |
352 | rdata.posX = (int)rinfo.RegionLocX; | 355 | rdata.posX = (int)rinfo.RegionLocX; |
@@ -359,7 +362,7 @@ namespace OpenSim.Services.GridService | |||
359 | return rdata; | 362 | return rdata; |
360 | } | 363 | } |
361 | 364 | ||
362 | protected GridRegion RegionData2RegionInfo(RegionData rdata) | 365 | public GridRegion RegionData2RegionInfo(RegionData rdata) |
363 | { | 366 | { |
364 | GridRegion rinfo = new GridRegion(rdata.Data); | 367 | GridRegion rinfo = new GridRegion(rdata.Data); |
365 | rinfo.RegionLocX = rdata.posX; | 368 | rinfo.RegionLocX = rdata.posX; |