diff options
| author | Melanie | 2009-09-28 23:03:47 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-28 23:03:47 +0100 |
| commit | 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch) | |
| tree | 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | |
| parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
| parent | Forgot a return statement. (diff) | |
| download | opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz | |
Merge branch 'grid-service-redux'
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs')
| -rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 80f2e79..002ea17 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | |||
| @@ -40,21 +40,12 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
| 40 | { | 40 | { |
| 41 | public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 | 41 | public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 |
| 42 | { | 42 | { |
| 43 | IHyperlink m_osw = null; | ||
| 44 | public IHyperlink HGServices | ||
| 45 | { | ||
| 46 | get { return m_osw; } | ||
| 47 | } | ||
| 48 | 43 | ||
| 49 | public HGCommunicationsGridMode( | 44 | public HGCommunicationsGridMode( |
| 50 | NetworkServersInfo serversInfo, | 45 | NetworkServersInfo serversInfo, |
| 51 | SceneManager sman, LibraryRootFolder libraryRootFolder) | 46 | SceneManager sman, LibraryRootFolder libraryRootFolder) |
| 52 | : base(serversInfo, libraryRootFolder) | 47 | : base(serversInfo, libraryRootFolder) |
| 53 | { | 48 | { |
| 54 | // From constructor at CommunicationsOGS1 | ||
| 55 | HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, sman, m_userProfileCacheService); | ||
| 56 | m_gridService = gridInterComms; | ||
| 57 | m_osw = gridInterComms; | ||
| 58 | 49 | ||
| 59 | HGUserServices userServices = new HGUserServices(this); | 50 | HGUserServices userServices = new HGUserServices(this); |
| 60 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | 51 | // This plugin arrangement could eventually be configurable rather than hardcoded here. |