diff options
author | Jeff Ames | 2008-07-22 15:01:04 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-22 15:01:04 +0000 |
commit | 186f83692c4d9d4c0c0e3fd49c777a62cfbc3e05 (patch) | |
tree | 6ba54411354c9199cce67641eb5d6b7332d9a1f4 /OpenSim/Data/NHibernate | |
parent | Clean up Meshmerizer.cs a bit to make it more readable (diff) | |
download | opensim-SC_OLD-186f83692c4d9d4c0c0e3fd49c777a62cfbc3e05.zip opensim-SC_OLD-186f83692c4d9d4c0c0e3fd49c777a62cfbc3e05.tar.gz opensim-SC_OLD-186f83692c4d9d4c0c0e3fd49c777a62cfbc3e05.tar.bz2 opensim-SC_OLD-186f83692c4d9d4c0c0e3fd49c777a62cfbc3e05.tar.xz |
Update svn properties. Squash a couple of warnings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateRegionData.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index 488cae4..9b5a9b6 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Data.NHibernate | |||
107 | { | 107 | { |
108 | return session.Load(typeof(AssetBase), uuid) as AssetBase; | 108 | return session.Load(typeof(AssetBase), uuid) as AssetBase; |
109 | } | 109 | } |
110 | catch (ObjectNotFoundException e) | 110 | catch (ObjectNotFoundException) |
111 | { | 111 | { |
112 | m_log.ErrorFormat("[NHIBERNATE] no such asset {0}", uuid); | 112 | m_log.ErrorFormat("[NHIBERNATE] no such asset {0}", uuid); |
113 | return null; | 113 | return null; |
@@ -125,7 +125,7 @@ namespace OpenSim.Data.NHibernate | |||
125 | { | 125 | { |
126 | AssetBase a = session.Load(typeof(AssetBase), asset.FullID) as AssetBase; | 126 | AssetBase a = session.Load(typeof(AssetBase), asset.FullID) as AssetBase; |
127 | } | 127 | } |
128 | catch (ObjectNotFoundException e) | 128 | catch (ObjectNotFoundException) |
129 | { | 129 | { |
130 | session.Save(asset); | 130 | session.Save(asset); |
131 | session.Flush(); | 131 | session.Flush(); |
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 55331d5..f6c67f5 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs | |||
@@ -125,7 +125,7 @@ namespace OpenSim.Data.NHibernate | |||
125 | session.Update(p); | 125 | session.Update(p); |
126 | m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID); | 126 | m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID); |
127 | } | 127 | } |
128 | catch (ObjectNotFoundException e) | 128 | catch (ObjectNotFoundException) |
129 | { | 129 | { |
130 | m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID); | 130 | m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID); |
131 | session.Save(p); | 131 | session.Save(p); |
@@ -145,7 +145,7 @@ namespace OpenSim.Data.NHibernate | |||
145 | session.Update(t); | 145 | session.Update(t); |
146 | session.Flush(); | 146 | session.Flush(); |
147 | } | 147 | } |
148 | catch (ObjectNotFoundException e) | 148 | catch (ObjectNotFoundException) |
149 | { | 149 | { |
150 | session.Save(t); | 150 | session.Save(t); |
151 | session.Flush(); | 151 | session.Flush(); |