diff options
author | John Hurliman | 2009-09-30 15:28:23 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Data/NHibernate/NHibernateUserData.cs | |
parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateUserData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 73b630f..1b0c4c9 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Data.NHibernate | |||
86 | m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid); | 86 | m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid); |
87 | 87 | ||
88 | user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid); | 88 | user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid); |
89 | if (user != null) | 89 | if (user != null) |
90 | { | 90 | { |
91 | UserAgentData agent = GetAgentByUUID(uuid); | 91 | UserAgentData agent = GetAgentByUUID(uuid); |
92 | if (agent != null) | 92 | if (agent != null) |
@@ -245,7 +245,7 @@ namespace OpenSim.Data.NHibernate | |||
245 | UserProfileData user=GetUserByUUID(agentID); | 245 | UserProfileData user=GetUserByUUID(agentID); |
246 | user.WebLoginKey = webLoginKey; | 246 | user.WebLoginKey = webLoginKey; |
247 | UpdateUserProfile(user); | 247 | UpdateUserProfile(user); |
248 | return; | 248 | return; |
249 | } | 249 | } |
250 | 250 | ||
251 | public override void AddNewUserFriend(UUID ownerId, UUID friendId, uint perms) | 251 | public override void AddNewUserFriend(UUID ownerId, UUID friendId, uint perms) |
@@ -258,7 +258,7 @@ namespace OpenSim.Data.NHibernate | |||
258 | { | 258 | { |
259 | manager.Insert(new UserFriend(UUID.Random(), friendId, ownerId, perms)); | 259 | manager.Insert(new UserFriend(UUID.Random(), friendId, ownerId, perms)); |
260 | } | 260 | } |
261 | return; | 261 | return; |
262 | } | 262 | } |
263 | 263 | ||
264 | private bool FriendRelationExists(UUID ownerId, UUID friendId) | 264 | private bool FriendRelationExists(UUID ownerId, UUID friendId) |