4 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index feacb2f..799ec2a 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -69,15 +69,13 @@ namespace OpenSim.Region.Communications.Hypergrid
                 m_log.Info("[HG]: Non-secureInventoryService.");
 
             HGUserServices userServices = new HGUserServices(this);
-            // This plugin arrangement could eventually be configurable rather than hardcoded here.           
-            OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
-            userServices.AddPlugin(userDataPlugin);            
+            // This plugin arrangement could eventually be configurable rather than hardcoded here.
+            userServices.AddPlugin(new TemporaryUserProfilePlugin());
+            userServices.AddPlugin(new OGS1UserDataPlugin(this));            
             
             m_userService = userServices;
             m_messageService = userServices;
-            m_avatarService = (IAvatarService)m_userService;
-           
+            m_avatarService = userServices;           
         }
-
     }
 }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 126f42b..43cc16a 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -62,7 +62,8 @@ namespace OpenSim.Region.Communications.Hypergrid
             m_inventoryServices = null;
             
             HGUserServices hgUserService = new HGUserServices(this, localUserService);
-            // This plugin arrangement could eventually be configurable rather than hardcoded here.                      
+            // This plugin arrangement could eventually be configurable rather than hardcoded here.
+            hgUserService.AddPlugin(new TemporaryUserProfilePlugin());
             hgUserService.AddPlugin(new OGS1UserDataPlugin(this));
             
             m_userService = hgUserService;            
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index c17f799..1861d52 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Communications.Local
             LocalUserServices lus 
                 = new LocalUserServices(
                     serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
+            lus.AddPlugin(new TemporaryUserProfilePlugin());
             lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);            
             m_userService = lus;
             m_userAdminService = lus;            
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index ee8562f..de6bd61 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.Communications.OGS1
 
             // This plugin arrangement could eventually be configurable rather than hardcoded here.           
             OGS1UserServices userServices = new OGS1UserServices(this);
-            OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
-            userServices.AddPlugin(userDataPlugin);
+            userServices.AddPlugin(new TemporaryUserProfilePlugin());
+            userServices.AddPlugin(new OGS1UserDataPlugin(this));
             
             m_userService = userServices;
             m_messageService = userServices;