CommunicationsManager is practically empty. Only NetworkServersInfo is there.

3 files changed, 15 insertions, 16 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index fbb7660..bbb1938 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -332,14 +332,16 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //EventManager.TriggerAvatarPickerRequest();
 
-            List<AvatarPickerAvatar> AvatarResponses = new List<AvatarPickerAvatar>();
-            AvatarResponses = m_sceneGridService.GenerateAgentPickerRequestResponse(RequestID, query);
+            List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query);
+
+            if (accounts == null)
+                return;
 
             AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
             // TODO: don't create new blocks if recycling an old packet
 
             AvatarPickerReplyPacket.DataBlock[] searchData =
-                new AvatarPickerReplyPacket.DataBlock[AvatarResponses.Count];
+                new AvatarPickerReplyPacket.DataBlock[accounts.Count];
             AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock();
 
             agentData.AgentID = avatarID;
@@ -348,16 +350,16 @@ namespace OpenSim.Region.Framework.Scenes
             //byte[] bytes = new byte[AvatarResponses.Count*32];
 
             int i = 0;
-            foreach (AvatarPickerAvatar item in AvatarResponses)
+            foreach (UserAccount item in accounts)
             {
-                UUID translatedIDtem = item.AvatarID;
+                UUID translatedIDtem = item.PrincipalID;
                 searchData[i] = new AvatarPickerReplyPacket.DataBlock();
                 searchData[i].AvatarID = translatedIDtem;
-                searchData[i].FirstName = Utils.StringToBytes((string) item.firstName);
-                searchData[i].LastName = Utils.StringToBytes((string) item.lastName);
+                searchData[i].FirstName = Utils.StringToBytes((string) item.FirstName);
+                searchData[i].LastName = Utils.StringToBytes((string) item.LastName);
                 i++;
             }
-            if (AvatarResponses.Count == 0)
+            if (accounts.Count == 0)
             {
                 searchData = new AvatarPickerReplyPacket.DataBlock[0];
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 04ecb5f..2e82748 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1443,12 +1443,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             //m_log.DebugFormat("[SCENE COMM]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
         }
-
-        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
-        {
-            return m_commsProvider.GenerateAgentPickerRequestResponse(queryID, query);
-        }
-        
+       
         public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
         {
             return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 97415f4..09b53d2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2573,7 +2573,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_appearance.SetAppearance(textureEntry, visualParams);
             if (m_appearance.AvatarHeight > 0)
                 SetHeight(m_appearance.AvatarHeight);
-            m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
+            AvatarData adata = new AvatarData(m_appearance);
+            m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
 
             SendAppearanceToAllOtherAgents();
             if (!m_startAnimationSet)
@@ -2593,7 +2594,8 @@ namespace OpenSim.Region.Framework.Scenes
         public void SetWearable(int wearableId, AvatarWearable wearable)
         {
             m_appearance.SetWearable(wearableId, wearable);
-            m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
+            AvatarData adata = new AvatarData(m_appearance);
+            m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
             m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
         }