Merge branch 'master' into diva-textures

1 files changed, 2 insertions, 11 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 80f2e79..e80f6ab 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -40,30 +40,21 @@ namespace OpenSim.Region.Communications.Hypergrid
 {
     public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1
     {
-        IHyperlink m_osw = null;
-        public IHyperlink HGServices
-        {
-            get { return m_osw; }
-        }
 
         public HGCommunicationsGridMode(
             NetworkServersInfo serversInfo,
             SceneManager sman, LibraryRootFolder libraryRootFolder)
             : base(serversInfo, libraryRootFolder)
         {
-            // From constructor at CommunicationsOGS1
-            HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, sman, m_userProfileCacheService);
-            m_gridService = gridInterComms;
-            m_osw = gridInterComms;
 
             HGUserServices userServices = new HGUserServices(this);
             // This plugin arrangement could eventually be configurable rather than hardcoded here.
             userServices.AddPlugin(new TemporaryUserProfilePlugin());
-            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));            
+            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));
             
             m_userService = userServices;
             m_messageService = userServices;
-            m_avatarService = userServices;           
+            m_avatarService = userServices;
         }
     }
 }