aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-01 10:05:22 +0000
committerTeravus Ovares2008-06-01 10:05:22 +0000
commitd20cae2d03f26f92e88f28ec187de50934144fcb (patch)
tree3a64d3c73f86b645a7d7b0970d2594bd223a0b81 /OpenSim/Framework
parent* Applying Dahlia's patch : 0001429: Patch to fix prism physical mesh and add... (diff)
downloadopensim-SC-d20cae2d03f26f92e88f28ec187de50934144fcb.zip
opensim-SC-d20cae2d03f26f92e88f28ec187de50934144fcb.tar.gz
opensim-SC-d20cae2d03f26f92e88f28ec187de50934144fcb.tar.bz2
opensim-SC-d20cae2d03f26f92e88f28ec187de50934144fcb.tar.xz
* Committing more unfinished stuff. Nothing significant at the moment. IM related.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs2
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs13
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 59ad188..a7f19e7 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -49,6 +49,8 @@ namespace OpenSim.Framework.Communications
49 /// <returns>A user profile. Returns null if no user profile is found.</returns> 49 /// <returns>A user profile. Returns null if no user profile is found.</returns>
50 UserProfileData GetUserProfile(LLUUID userId); 50 UserProfileData GetUserProfile(LLUUID userId);
51 51
52 UserAgentData GetAgentByUUID(LLUUID userId);
53
52 void clearUserAgent(LLUUID avatarID); 54 void clearUserAgent(LLUUID avatarID);
53 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query); 55 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query);
54 56
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 8985bb6..fe09b03 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -103,7 +103,20 @@ namespace OpenSim.Framework.Communications
103 103
104 return null; 104 return null;
105 } 105 }
106 public UserAgentData GetAgentByUUID(LLUUID userId)
107 {
108 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
109 {
110 UserAgentData agent = plugin.Value.GetAgentByUUID(userId);
106 111
112 if (agent != null)
113 {
114 return agent;
115 }
116 }
117
118 return null;
119 }
107 // see IUserService 120 // see IUserService
108 public UserProfileData GetUserProfile(LLUUID uuid) 121 public UserProfileData GetUserProfile(LLUUID uuid)
109 { 122 {