aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-13 22:48:19 +0000
committerTeravus Ovares2007-11-13 22:48:19 +0000
commit9f6b3e2357e76b9b85b447da189b4bf4163edd3c (patch)
tree7d9c39258e45e6271db953608e6868433f9ac70d /OpenSim/Framework/Communications
parentfirst pass on unlinking of objects. From Jay Clarke (IBM) (diff)
downloadopensim-SC-9f6b3e2357e76b9b85b447da189b4bf4163edd3c.zip
opensim-SC-9f6b3e2357e76b9b85b447da189b4bf4163edd3c.tar.gz
opensim-SC-9f6b3e2357e76b9b85b447da189b4bf4163edd3c.tar.bz2
opensim-SC-9f6b3e2357e76b9b85b447da189b4bf4163edd3c.tar.xz
* Added AvatarPicker in Standalone mode. Works for finding avatar to ban, manually trying to add a friend (with the add button) or useful to those who are curious which usernames have visited your standalone sim. Important for future development :D.
* Grid mode always returns 0 results until the Grid Communications portion is done.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs10
-rw-r--r--OpenSim/Framework/Communications/IGridServices.cs1
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs19
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 @@
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
31using System.Collections.Generic;
31using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
32using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Servers; 34using 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