* Fission OGS1UserServices into user service and OGS1 user data plugin components

* Make OGS1UserServices inherit from UserManagerBase
* This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims

1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index f32b160..ee8562f 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -55,7 +55,11 @@ namespace OpenSim.Region.Communications.OGS1
                 m_defaultInventoryHost = invService.Host;
             }
 
+            // This plugin arrangement could eventually be configurable rather than hardcoded here.           
             OGS1UserServices userServices = new OGS1UserServices(this);
+            OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
+            userServices.AddPlugin(userDataPlugin);
+            
             m_userService = userServices;
             m_messageService = userServices;
             m_avatarService = (IAvatarService)m_userService;