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
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected Dictionary<UUID, string[]> m_nameRequestCache = new Dictionary<UUID, string[]>();
-
-        public IUserService UserService
-        {
-            get { return m_userService; }
-        }
-        protected IUserService m_userService;
-
-        public IAvatarService AvatarService
-        {
-            get { return m_avatarService; }
-        }
-        protected IAvatarService m_avatarService;
-
-        public IInterServiceInventoryServices InterServiceInventoryService
-        {
-            get { return m_interServiceInventoryService; }
-        }
-        protected IInterServiceInventoryServices m_interServiceInventoryService;
-
         public NetworkServersInfo NetworkServersInfo
         {
             get { return m_networkServersInfo; }
@@ -72,15 +52,6 @@ namespace OpenSim.Framework.Communications
         protected NetworkServersInfo m_networkServersInfo;
              
         /// <summary>
-        /// Interface to user service for administrating users.
-        /// </summary>
-        public IUserAdminService UserAdminService
-        {
-            get { return m_userAdminService; }
-        }
-        protected IUserAdminService m_userAdminService;
-
-        /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="serversInfo"></param>
@@ -90,20 +61,5 @@ namespace OpenSim.Framework.Communications
             m_networkServersInfo = serversInfo;
         }
 
-        #region Packet Handlers
-
-        public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
-        {
-            m_userService.UpdateUserProfile(UserProfile);
-            return;
-        }
-
-        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query);
-            return pickerlist;
-        }
-
-        #endregion
     }
 }
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
             }
             else
             {
-                //
-                // WARNING: This is a horrible hack
-                // The purpose here is to avoid touching the user server at this point.
-                // There are dragons there that I can't deal with right now.
-                // diva 06/09/09
-                //
-                if (m_InventoryService != null)
-                {
-                    // local service (standalone)
-                    m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory");
-                    m_InventoryService.CreateUserInventory(userProf.ID);
-                }
-                else if (m_commsManager.InterServiceInventoryService != null)
-                {
-                    // used by the user server
-                    m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");
-                    m_commsManager.InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
-                }
-
                 return userProf.ID;
             }
         }