diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 0fb297f..3b67d6e 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -91,7 +91,9 @@ namespace OpenSim.Data.NHibernate | |||
91 | { | 91 | { |
92 | user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; | 92 | user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; |
93 | } | 93 | } |
94 | catch (Exception) {} | 94 | catch (Exception) |
95 | { | ||
96 | } | ||
95 | 97 | ||
96 | return (user != null); | 98 | return (user != null); |
97 | } | 99 | } |
@@ -161,10 +163,13 @@ namespace OpenSim.Data.NHibernate | |||
161 | { | 163 | { |
162 | UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData; | 164 | UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData; |
163 | 165 | ||
164 | if (old == null) { | 166 | if (old == null) |
167 | { | ||
165 | session.Save(agent); | 168 | session.Save(agent); |
166 | session.Transaction.Commit(); | 169 | session.Transaction.Commit(); |
167 | } else { | 170 | } |
171 | else | ||
172 | { | ||
168 | UpdateUserAgent(agent); | 173 | UpdateUserAgent(agent); |
169 | } | 174 | } |
170 | } | 175 | } |
@@ -235,13 +240,13 @@ namespace OpenSim.Data.NHibernate | |||
235 | 240 | ||
236 | // TODO: actually implement these | 241 | // TODO: actually implement these |
237 | public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; } | 242 | public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; } |
238 | public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) {return;} | 243 | public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) { return; } |
239 | public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) {return;} | 244 | public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } |
240 | public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) {return;} | 245 | public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { return; } |
241 | public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) {return;} | 246 | public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } |
242 | public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) {return new List<FriendListItem>();} | 247 | public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) { return new List<FriendListItem>(); } |
243 | public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) {return true;} | 248 | public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) { return true; } |
244 | public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory) {return true;} | 249 | public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory) { return true; } |
245 | 250 | ||
246 | /// Appearance | 251 | /// Appearance |
247 | /// TODO: stubs for now to get us to a compiling state gently | 252 | /// TODO: stubs for now to get us to a compiling state gently |