diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 24 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 12 |
4 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index a339ee3..174667e 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -137,18 +137,18 @@ namespace OpenSim.Data.NHibernate | |||
137 | } | 137 | } |
138 | } | 138 | } |
139 | 139 | ||
140 | private void LogAssetLoad(AssetBase asset) | 140 | // private void LogAssetLoad(AssetBase asset) |
141 | { | 141 | // { |
142 | string temporary = asset.Temporary ? "Temporary" : "Stored"; | 142 | // string temporary = asset.Temporary ? "Temporary" : "Stored"; |
143 | string local = asset.Local ? "Local" : "Remote"; | 143 | // string local = asset.Local ? "Local" : "Remote"; |
144 | 144 | ||
145 | int assetLength = (asset.Data != null) ? asset.Data.Length : 0; | 145 | // int assetLength = (asset.Data != null) ? asset.Data.Length : 0; |
146 | 146 | ||
147 | m_log.Info("[SQLITE]: " + | 147 | // m_log.Info("[SQLITE]: " + |
148 | string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)", | 148 | // string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)", |
149 | asset.FullID, asset.Name, asset.Description, asset.Type, | 149 | // asset.FullID, asset.Name, asset.Description, asset.Type, |
150 | asset.InvType, temporary, local, assetLength)); | 150 | // asset.InvType, temporary, local, assetLength)); |
151 | } | 151 | // } |
152 | 152 | ||
153 | override public bool ExistsAsset(LLUUID uuid) | 153 | override public bool ExistsAsset(LLUUID uuid) |
154 | { | 154 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index 46dcbad..153d2d5 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs | |||
@@ -277,7 +277,7 @@ namespace OpenSim.Data.NHibernate | |||
277 | public string getVersion() | 277 | public string getVersion() |
278 | { | 278 | { |
279 | Module module = GetType().Module; | 279 | Module module = GetType().Module; |
280 | string dllName = module.Assembly.ManifestModule.Name; | 280 | // string dllName = module.Assembly.ManifestModule.Name; |
281 | Version dllVersion = module.Assembly.GetName().Version; | 281 | Version dllVersion = module.Assembly.GetName().Version; |
282 | 282 | ||
283 | 283 | ||
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs index 6f13294..4c5ec01 100644 --- a/OpenSim/Data/NHibernate/NHibernateManager.cs +++ b/OpenSim/Data/NHibernate/NHibernateManager.cs | |||
@@ -33,11 +33,11 @@ namespace OpenSim.Data.NHibernate | |||
33 | { | 33 | { |
34 | internal class NHibernateManager | 34 | internal class NHibernateManager |
35 | { | 35 | { |
36 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 36 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
37 | 37 | ||
38 | private ISessionFactory factory; | 38 | // private ISessionFactory factory; |
39 | private ISession session; | 39 | // private ISession session; |
40 | private ITransaction transaction; | 40 | // private ITransaction transaction; |
41 | 41 | ||
42 | public NHibernateManager() | 42 | public NHibernateManager() |
43 | { | 43 | { |
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 | ||