diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Data/NHibernate/NHibernateUserData.cs | |
parent | more warnings to go. (diff) | |
download | opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateUserData.cs')
-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 9cb576d..9d9aec9 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -91,7 +91,7 @@ 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 (ObjectNotFoundException e) | 94 | catch (ObjectNotFoundException) |
95 | { | 95 | { |
96 | user = null; | 96 | user = null; |
97 | } | 97 | } |
@@ -108,7 +108,7 @@ namespace OpenSim.Data.NHibernate | |||
108 | user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; | 108 | user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; |
109 | user.CurrentAgent = GetAgentByUUID(uuid); | 109 | user.CurrentAgent = GetAgentByUUID(uuid); |
110 | } | 110 | } |
111 | catch (ObjectNotFoundException e) | 111 | catch (ObjectNotFoundException) |
112 | { | 112 | { |
113 | user = null; | 113 | user = null; |
114 | } | 114 | } |
@@ -143,7 +143,7 @@ namespace OpenSim.Data.NHibernate | |||
143 | UserAgentData old = session.Load(typeof(UserAgentData), uuid) as UserAgentData; | 143 | UserAgentData old = session.Load(typeof(UserAgentData), uuid) as UserAgentData; |
144 | session.Delete(old); | 144 | session.Delete(old); |
145 | } | 145 | } |
146 | catch (ObjectNotFoundException e) | 146 | catch (ObjectNotFoundException) |
147 | { | 147 | { |
148 | } | 148 | } |
149 | session.Save(agent); | 149 | session.Save(agent); |
@@ -173,7 +173,7 @@ namespace OpenSim.Data.NHibernate | |||
173 | UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData; | 173 | UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData; |
174 | session.Delete(old); | 174 | session.Delete(old); |
175 | } | 175 | } |
176 | catch (ObjectNotFoundException e) | 176 | catch (ObjectNotFoundException) |
177 | { | 177 | { |
178 | } | 178 | } |
179 | session.Save(agent); | 179 | session.Save(agent); |
@@ -260,7 +260,7 @@ namespace OpenSim.Data.NHibernate | |||
260 | // TODO: I'm sure I'll have to do something silly here | 260 | // TODO: I'm sure I'll have to do something silly here |
261 | try { | 261 | try { |
262 | appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance; | 262 | appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance; |
263 | } catch (ObjectNotFoundException e) { | 263 | } catch (ObjectNotFoundException) { |
264 | appearance = null; | 264 | appearance = null; |
265 | } | 265 | } |
266 | return appearance; | 266 | return appearance; |
@@ -271,7 +271,7 @@ namespace OpenSim.Data.NHibernate | |||
271 | AvatarAppearance appearance; | 271 | AvatarAppearance appearance; |
272 | try { | 272 | try { |
273 | appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance; | 273 | appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance; |
274 | } catch (ObjectNotFoundException e) { | 274 | } catch (ObjectNotFoundException) { |
275 | appearance = null; | 275 | appearance = null; |
276 | } | 276 | } |
277 | 277 | ||