diff options
author | Diva Canto | 2013-07-28 13:49:58 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-28 13:49:58 -0700 |
commit | 7b0b5c9d97dea840e1ede6e2318b3c049c804983 (patch) | |
tree | 75dda682cc5e0d770068914ea36d68209c429dc0 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups | |
parent | This makes people search work. (diff) | |
download | opensim-SC_OLD-7b0b5c9d97dea840e1ede6e2318b3c049c804983.zip opensim-SC_OLD-7b0b5c9d97dea840e1ede6e2318b3c049c804983.tar.gz opensim-SC_OLD-7b0b5c9d97dea840e1ede6e2318b3c049c804983.tar.bz2 opensim-SC_OLD-7b0b5c9d97dea840e1ede6e2318b3c049c804983.tar.xz |
Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 32fb54b..f4734b7 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -250,7 +250,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
250 | 250 | ||
251 | client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest; | 251 | client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest; |
252 | client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; | 252 | client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; |
253 | client.OnDirFindQuery += OnDirFindQuery; | ||
254 | client.OnRequestAvatarProperties += OnRequestAvatarProperties; | 253 | client.OnRequestAvatarProperties += OnRequestAvatarProperties; |
255 | 254 | ||
256 | // Used for Notices and Group Invites/Accept/Reject | 255 | // Used for Notices and Group Invites/Accept/Reject |
@@ -303,21 +302,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
303 | } | 302 | } |
304 | */ | 303 | */ |
305 | 304 | ||
306 | void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart) | ||
307 | { | ||
308 | if (((DirFindFlags)queryFlags & DirFindFlags.Groups) == DirFindFlags.Groups) | ||
309 | { | ||
310 | if (m_debugEnabled) | ||
311 | m_log.DebugFormat( | ||
312 | "[GROUPS]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", | ||
313 | System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart); | ||
314 | |||
315 | // TODO: This currently ignores pretty much all the query flags including Mature and sort order | ||
316 | remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetRequestingAgentID(remoteClient), queryText).ToArray()); | ||
317 | } | ||
318 | |||
319 | } | ||
320 | |||
321 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, UUID dataForAgentID, UUID sessionID) | 305 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, UUID dataForAgentID, UUID sessionID) |
322 | { | 306 | { |
323 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 307 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
@@ -1178,6 +1162,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1178 | } | 1162 | } |
1179 | } | 1163 | } |
1180 | 1164 | ||
1165 | public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query) | ||
1166 | { | ||
1167 | return m_groupData.FindGroups(GetRequestingAgentID(remoteClient), query); | ||
1168 | } | ||
1169 | |||
1170 | |||
1181 | #endregion | 1171 | #endregion |
1182 | 1172 | ||
1183 | #region Client/Update Tools | 1173 | #region Client/Update Tools |