diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 3f1f260..8aa4aa2 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Data.NHibernate | |||
61 | UserProfileData user = null; | 61 | UserProfileData user = null; |
62 | 62 | ||
63 | m_log.InfoFormat("[NHIBERNATE] ExistsUser; {0}", uuid); | 63 | m_log.InfoFormat("[NHIBERNATE] ExistsUser; {0}", uuid); |
64 | user = (UserProfileData)manager.Load(typeof(UserProfileData), uuid); | 64 | user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid); |
65 | 65 | ||
66 | if (user == null) | 66 | if (user == null) |
67 | { | 67 | { |
@@ -78,7 +78,7 @@ namespace OpenSim.Data.NHibernate | |||
78 | UserProfileData user; | 78 | UserProfileData user; |
79 | m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid); | 79 | m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid); |
80 | 80 | ||
81 | user = (UserProfileData)manager.Load(typeof(UserProfileData), uuid); | 81 | user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid); |
82 | if (user != null) | 82 | if (user != null) |
83 | { | 83 | { |
84 | UserAgentData agent = GetAgentByUUID(uuid); | 84 | UserAgentData agent = GetAgentByUUID(uuid); |
@@ -163,7 +163,7 @@ namespace OpenSim.Data.NHibernate | |||
163 | } | 163 | } |
164 | 164 | ||
165 | 165 | ||
166 | UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), agent.ProfileID); | 166 | UserAgentData old = (UserAgentData)manager.Get(typeof(UserAgentData), agent.ProfileID); |
167 | if (old != null) | 167 | if (old != null) |
168 | { | 168 | { |
169 | manager.Delete(old); | 169 | manager.Delete(old); |
@@ -182,7 +182,7 @@ namespace OpenSim.Data.NHibernate | |||
182 | override public UserAgentData GetAgentByUUID(UUID uuid) | 182 | override public UserAgentData GetAgentByUUID(UUID uuid) |
183 | { | 183 | { |
184 | m_log.InfoFormat("[NHIBERNATE] GetAgentByUUID: {0} ", uuid); | 184 | m_log.InfoFormat("[NHIBERNATE] GetAgentByUUID: {0} ", uuid); |
185 | return (UserAgentData)manager.Load(typeof(UserAgentData), uuid); | 185 | return (UserAgentData)manager.Get(typeof(UserAgentData), uuid); |
186 | } | 186 | } |
187 | 187 | ||
188 | override public UserProfileData GetUserByName(string fname, string lname) | 188 | override public UserProfileData GetUserByName(string fname, string lname) |
@@ -397,12 +397,12 @@ namespace OpenSim.Data.NHibernate | |||
397 | /// TODO: stubs for now to get us to a compiling state gently | 397 | /// TODO: stubs for now to get us to a compiling state gently |
398 | public override AvatarAppearance GetUserAppearance(UUID user) | 398 | public override AvatarAppearance GetUserAppearance(UUID user) |
399 | { | 399 | { |
400 | return (AvatarAppearance)manager.Load(typeof(AvatarAppearance), user); | 400 | return (AvatarAppearance)manager.Get(typeof(AvatarAppearance), user); |
401 | } | 401 | } |
402 | 402 | ||
403 | private bool ExistsAppearance(UUID uuid) | 403 | private bool ExistsAppearance(UUID uuid) |
404 | { | 404 | { |
405 | AvatarAppearance appearance = (AvatarAppearance)manager.Load(typeof(AvatarAppearance), uuid); | 405 | AvatarAppearance appearance = (AvatarAppearance)manager.Get(typeof(AvatarAppearance), uuid); |
406 | if (appearance == null) | 406 | if (appearance == null) |
407 | { | 407 | { |
408 | return false; | 408 | return false; |