aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/CommunicationsManager.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/CommunicationsManager.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/Communications/CommunicationsManager.cs')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 08dbc80..e6413e8 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Communications
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); 45 protected Dictionary<UUID, string[]> m_nameRequestCache = new Dictionary<UUID, string[]>();
46 46
47 public IUserService UserService 47 public IUserService UserService
48 { 48 {
@@ -238,8 +238,8 @@ namespace OpenSim.Framework.Communications
238 /// <param name="password"></param> 238 /// <param name="password"></param>
239 /// <param name="regX"></param> 239 /// <param name="regX"></param>
240 /// <param name="regY"></param> 240 /// <param name="regY"></param>
241 /// <returns>The UUID of the added user. Returns LLUUID.Zero if the add was unsuccessful</returns> 241 /// <returns>The UUID of the added user. Returns UUID.Zero if the add was unsuccessful</returns>
242 public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY) 242 public UUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
243 { 243 {
244 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); 244 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
245 245
@@ -247,7 +247,7 @@ namespace OpenSim.Framework.Communications
247 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); 247 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName);
248 if (userProf == null) 248 if (userProf == null)
249 { 249 {
250 return LLUUID.Zero; 250 return UUID.Zero;
251 } 251 }
252 else 252 else
253 { 253 {
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications
265 /// <param name="friendlistowner">The agent that who's friends list is being added to</param> 265 /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
266 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> 266 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
267 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 267 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
268 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 268 public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
269 { 269 {
270 m_userService.AddNewUserFriend(friendlistowner, friend, perms); 270 m_userService.AddNewUserFriend(friendlistowner, friend, perms);
271 } 271 }
@@ -279,7 +279,7 @@ namespace OpenSim.Framework.Communications
279 /// <param name="posx"></param> 279 /// <param name="posx"></param>
280 /// <param name="posy"></param> 280 /// <param name="posy"></param>
281 /// <param name="posz"></param> 281 /// <param name="posz"></param>
282 public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) 282 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
283 { 283 {
284 m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); 284 m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
285 285
@@ -290,7 +290,7 @@ namespace OpenSim.Framework.Communications
290 /// </summary> 290 /// </summary>
291 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 291 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
292 /// <param name="friend">The Ex-friend agent</param> 292 /// <param name="friend">The Ex-friend agent</param>
293 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 293 public void RemoveUserFriend(UUID friendlistowner, UUID friend)
294 { 294 {
295 m_userService.RemoveUserFriend(friendlistowner, friend); 295 m_userService.RemoveUserFriend(friendlistowner, friend);
296 } 296 }
@@ -301,16 +301,16 @@ namespace OpenSim.Framework.Communications
301 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 301 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
302 /// <param name="friend">The agent that is getting or loosing permissions</param> 302 /// <param name="friend">The agent that is getting or loosing permissions</param>
303 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 303 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
304 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 304 public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
305 { 305 {
306 m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms); 306 m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms);
307 } 307 }
308 308
309 /// <summary> 309 /// <summary>
310 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 310 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
311 /// </summary> 311 /// </summary>
312 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 312 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
313 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 313 public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
314 { 314 {
315 return m_userService.GetUserFriendList(friendlistowner); 315 return m_userService.GetUserFriendList(friendlistowner);
316 } 316 }
@@ -325,7 +325,7 @@ namespace OpenSim.Framework.Communications
325 return; 325 return;
326 } 326 }
327 327
328 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 328 public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
329 { 329 {
330 if (uuid == m_userProfileCacheService.libraryRoot.Owner) 330 if (uuid == m_userProfileCacheService.libraryRoot.Owner)
331 { 331 {
@@ -342,7 +342,7 @@ namespace OpenSim.Framework.Communications
342 } 342 }
343 } 343 }
344 344
345 private string[] doUUIDNameRequest(LLUUID uuid) 345 private string[] doUUIDNameRequest(UUID uuid)
346 { 346 {
347 string[] returnstring = new string[0]; 347 string[] returnstring = new string[0];
348 bool doLookup = false; 348 bool doLookup = false;
@@ -366,7 +366,7 @@ namespace OpenSim.Framework.Communications
366 if (profileData != null) 366 if (profileData != null)
367 { 367 {
368 returnstring = new string[2]; 368 returnstring = new string[2];
369 // LLUUID profileId = profileData.ID; 369 // UUID profileId = profileData.ID;
370 returnstring[0] = profileData.FirstName; 370 returnstring[0] = profileData.FirstName;
371 returnstring[1] = profileData.SurName; 371 returnstring[1] = profileData.SurName;
372 lock (m_nameRequestCache) 372 lock (m_nameRequestCache)
@@ -380,13 +380,13 @@ namespace OpenSim.Framework.Communications
380 380
381 } 381 }
382 382
383 public bool UUIDNameCachedTest(LLUUID uuid) 383 public bool UUIDNameCachedTest(UUID uuid)
384 { 384 {
385 lock (m_nameRequestCache) 385 lock (m_nameRequestCache)
386 return m_nameRequestCache.ContainsKey(uuid); 386 return m_nameRequestCache.ContainsKey(uuid);
387 } 387 }
388 388
389 public string UUIDNameRequestString(LLUUID uuid) 389 public string UUIDNameRequestString(UUID uuid)
390 { 390 {
391 string[] names = doUUIDNameRequest(uuid); 391 string[] names = doUUIDNameRequest(uuid);
392 if (names.Length == 2) 392 if (names.Length == 2)
@@ -400,7 +400,7 @@ namespace OpenSim.Framework.Communications
400 return "(hippos)"; 400 return "(hippos)";
401 } 401 }
402 402
403 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 403 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
404 { 404 {
405 List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query); 405 List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query);
406 return pickerlist; 406 return pickerlist;