aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs44
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs19
2 files changed, 0 insertions, 63 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 4dff71f..bc04009 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -45,26 +45,6 @@ namespace OpenSim.Framework.Communications
45 { 45 {
46 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 protected Dictionary<UUID, string[]> m_nameRequestCache = new Dictionary<UUID, string[]>();
49
50 public IUserService UserService
51 {
52 get { return m_userService; }
53 }
54 protected IUserService m_userService;
55
56 public IAvatarService AvatarService
57 {
58 get { return m_avatarService; }
59 }
60 protected IAvatarService m_avatarService;
61
62 public IInterServiceInventoryServices InterServiceInventoryService
63 {
64 get { return m_interServiceInventoryService; }
65 }
66 protected IInterServiceInventoryServices m_interServiceInventoryService;
67
68 public NetworkServersInfo NetworkServersInfo 48 public NetworkServersInfo NetworkServersInfo
69 { 49 {
70 get { return m_networkServersInfo; } 50 get { return m_networkServersInfo; }
@@ -72,15 +52,6 @@ namespace OpenSim.Framework.Communications
72 protected NetworkServersInfo m_networkServersInfo; 52 protected NetworkServersInfo m_networkServersInfo;
73 53
74 /// <summary> 54 /// <summary>
75 /// Interface to user service for administrating users.
76 /// </summary>
77 public IUserAdminService UserAdminService
78 {
79 get { return m_userAdminService; }
80 }
81 protected IUserAdminService m_userAdminService;
82
83 /// <summary>
84 /// Constructor 55 /// Constructor
85 /// </summary> 56 /// </summary>
86 /// <param name="serversInfo"></param> 57 /// <param name="serversInfo"></param>
@@ -90,20 +61,5 @@ namespace OpenSim.Framework.Communications
90 m_networkServersInfo = serversInfo; 61 m_networkServersInfo = serversInfo;
91 } 62 }
92 63
93 #region Packet Handlers
94
95 public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
96 {
97 m_userService.UpdateUserProfile(UserProfile);
98 return;
99 }
100
101 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
102 {
103 List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query);
104 return pickerlist;
105 }
106
107 #endregion
108 } 64 }
109} 65}
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 4f0af06..caa9c1c 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -686,25 +686,6 @@ namespace OpenSim.Framework.Communications
686 } 686 }
687 else 687 else
688 { 688 {
689 //
690 // WARNING: This is a horrible hack
691 // The purpose here is to avoid touching the user server at this point.
692 // There are dragons there that I can't deal with right now.
693 // diva 06/09/09
694 //
695 if (m_InventoryService != null)
696 {
697 // local service (standalone)
698 m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory");
699 m_InventoryService.CreateUserInventory(userProf.ID);
700 }
701 else if (m_commsManager.InterServiceInventoryService != null)
702 {
703 // used by the user server
704 m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");
705 m_commsManager.InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
706 }
707
708 return userProf.ID; 689 return userProf.ID;
709 } 690 }
710 } 691 }