3 files changed, 30 insertions, 0 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 77c7261..7b1a97e 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -28,6 +28,7 @@
 using System;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
+using System.Collections.Generic;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
@@ -173,6 +174,15 @@ namespace OpenSim.Framework.Communications
                 }
             }
         }
+        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
+        {
+
+
+            List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query);
+
+               
+            return pickerlist;
+        }
 
         #endregion
     }
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index ce6205f..3d0af09 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -36,5 +36,6 @@ namespace OpenSim.Framework.Communications
         List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
         RegionInfo RequestNeighbourInfo(ulong regionHandle);
         List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
+        
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 408f37c..3a32ba9 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -105,6 +105,25 @@ namespace OpenSim.Framework.UserManagement
             return null;
         }
 
+        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
+        {
+            List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    pickerlist = plugin.Value.GeneratePickerResults(queryID, query);
+
+                }
+                catch (Exception e)
+                {
+                    MainLog.Instance.Verbose("Unable to generate AgentPickerData via  " + plugin.Key + "(" + query + ")");
+                    return new List<AvatarPickerAvatar>();
+                }
+            }
+            return pickerlist;
+        }
+
 
         /// <summary>
         /// Loads a user profile by name