aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-23 18:24:39 +0000
committerJustin Clarke Casey2009-04-23 18:24:39 +0000
commitef9d140022b57b175f41602731ec73775bdf2d9c (patch)
treed7a561e3ce85b3064b3f84b06d2e3f2fb4f4301e /OpenSim/Region/Communications
parentfix up contributors list to have 3 contributors sections (diff)
downloadopensim-SC_OLD-ef9d140022b57b175f41602731ec73775bdf2d9c.zip
opensim-SC_OLD-ef9d140022b57b175f41602731ec73775bdf2d9c.tar.gz
opensim-SC_OLD-ef9d140022b57b175f41602731ec73775bdf2d9c.tar.bz2
opensim-SC_OLD-ef9d140022b57b175f41602731ec73775bdf2d9c.tar.xz
* Add user data plugin to store temporary profiles (which are distinct from cached)
* Plugin not yet used * Existing functionality should not be affected in any way
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs10
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs3
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs4
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
69 m_log.Info("[HG]: Non-secureInventoryService."); 69 m_log.Info("[HG]: Non-secureInventoryService.");
70 70
71 HGUserServices userServices = new HGUserServices(this); 71 HGUserServices userServices = new HGUserServices(this);
72 // This plugin arrangement could eventually be configurable rather than hardcoded here. 72 // This plugin arrangement could eventually be configurable rather than hardcoded here.
73 OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this); 73 userServices.AddPlugin(new TemporaryUserProfilePlugin());
74 userServices.AddPlugin(userDataPlugin); 74 userServices.AddPlugin(new OGS1UserDataPlugin(this));
75 75
76 m_userService = userServices; 76 m_userService = userServices;
77 m_messageService = userServices; 77 m_messageService = userServices;
78 m_avatarService = (IAvatarService)m_userService; 78 m_avatarService = userServices;
79
80 } 79 }
81
82 } 80 }
83} 81}
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
62 m_inventoryServices = null; 62 m_inventoryServices = null;
63 63
64 HGUserServices hgUserService = new HGUserServices(this, localUserService); 64 HGUserServices hgUserService = new HGUserServices(this, localUserService);
65 // This plugin arrangement could eventually be configurable rather than hardcoded here. 65 // This plugin arrangement could eventually be configurable rather than hardcoded here.
66 hgUserService.AddPlugin(new TemporaryUserProfilePlugin());
66 hgUserService.AddPlugin(new OGS1UserDataPlugin(this)); 67 hgUserService.AddPlugin(new OGS1UserDataPlugin(this));
67 68
68 m_userService = hgUserService; 69 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
52 LocalUserServices lus 52 LocalUserServices lus
53 = new LocalUserServices( 53 = new LocalUserServices(
54 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); 54 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
55 lus.AddPlugin(new TemporaryUserProfilePlugin());
55 lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); 56 lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);
56 m_userService = lus; 57 m_userService = lus;
57 m_userAdminService = lus; 58 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
57 57
58 // This plugin arrangement could eventually be configurable rather than hardcoded here. 58 // This plugin arrangement could eventually be configurable rather than hardcoded here.
59 OGS1UserServices userServices = new OGS1UserServices(this); 59 OGS1UserServices userServices = new OGS1UserServices(this);
60 OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this); 60 userServices.AddPlugin(new TemporaryUserProfilePlugin());
61 userServices.AddPlugin(userDataPlugin); 61 userServices.AddPlugin(new OGS1UserDataPlugin(this));
62 62
63 m_userService = userServices; 63 m_userService = userServices;
64 m_messageService = userServices; 64 m_messageService = userServices;