diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/IGridServices.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 19 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework.Communications.Cache; | 30 | using OpenSim.Framework.Communications.Cache; |
31 | using System.Collections.Generic; | ||
31 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
32 | using OpenSim.Framework.Interfaces; | 33 | using OpenSim.Framework.Interfaces; |
33 | using OpenSim.Framework.Servers; | 34 | using OpenSim.Framework.Servers; |
@@ -173,6 +174,15 @@ namespace OpenSim.Framework.Communications | |||
173 | } | 174 | } |
174 | } | 175 | } |
175 | } | 176 | } |
177 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) | ||
178 | { | ||
179 | |||
180 | |||
181 | List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query); | ||
182 | |||
183 | |||
184 | return pickerlist; | ||
185 | } | ||
176 | 186 | ||
177 | #endregion | 187 | #endregion |
178 | } | 188 | } |
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 | |||
36 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); | 36 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); |
37 | RegionInfo RequestNeighbourInfo(ulong regionHandle); | 37 | RegionInfo RequestNeighbourInfo(ulong regionHandle); |
38 | List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY); | 38 | List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY); |
39 | |||
39 | } | 40 | } |
40 | } \ No newline at end of file | 41 | } \ 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 | |||
105 | return null; | 105 | return null; |
106 | } | 106 | } |
107 | 107 | ||
108 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) | ||
109 | { | ||
110 | List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); | ||
111 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | ||
112 | { | ||
113 | try | ||
114 | { | ||
115 | pickerlist = plugin.Value.GeneratePickerResults(queryID, query); | ||
116 | |||
117 | } | ||
118 | catch (Exception e) | ||
119 | { | ||
120 | MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); | ||
121 | return new List<AvatarPickerAvatar>(); | ||
122 | } | ||
123 | } | ||
124 | return pickerlist; | ||
125 | } | ||
126 | |||
108 | 127 | ||
109 | /// <summary> | 128 | /// <summary> |
110 | /// Loads a user profile by name | 129 | /// Loads a user profile by name |