aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-21 21:24:39 +0000
committerJustin Clarke Casey2008-11-21 21:24:39 +0000
commitc0cd681608c3c8f5ffc27c855720a131c3989da8 (patch)
tree283d1795c96997c1eb9e74956ae987dce5ba9781
parent* refactor: Rip out SOP inventory from the partial into a separate class (diff)
downloadopensim-SC-c0cd681608c3c8f5ffc27c855720a131c3989da8.zip
opensim-SC-c0cd681608c3c8f5ffc27c855720a131c3989da8.tar.gz
opensim-SC-c0cd681608c3c8f5ffc27c855720a131c3989da8.tar.bz2
opensim-SC-c0cd681608c3c8f5ffc27c855720a131c3989da8.tar.xz
* Comment out unused access time method in MSSQL
* This should probably be being called in FetchAsset() instead as for all the other databases, but I lack the means to test MSSQL
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs36
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
2 files changed, 18 insertions, 19 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 68f353d..b8753a1 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -212,24 +212,24 @@ namespace OpenSim.Data.MSSQL
212 } 212 }
213 } 213 }
214 214
215 215// Commented out since currently unused - this probably should be called in FetchAsset()
216 private void UpdateAccessTime(AssetBase asset) 216// private void UpdateAccessTime(AssetBase asset)
217 { 217// {
218 using (AutoClosingSqlCommand cmd = database.Query("UPDATE assets SET access_time = @access_time WHERE id=@id")) 218// using (AutoClosingSqlCommand cmd = database.Query("UPDATE assets SET access_time = @access_time WHERE id=@id"))
219 { 219// {
220 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 220// int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
221 cmd.Parameters.AddWithValue("@id", asset.FullID.ToString()); 221// cmd.Parameters.AddWithValue("@id", asset.FullID.ToString());
222 cmd.Parameters.AddWithValue("@access_time", now); 222// cmd.Parameters.AddWithValue("@access_time", now);
223 try 223// try
224 { 224// {
225 cmd.ExecuteNonQuery(); 225// cmd.ExecuteNonQuery();
226 } 226// }
227 catch (Exception e) 227// catch (Exception e)
228 { 228// {
229 m_log.Error(e.ToString()); 229// m_log.Error(e.ToString());
230 } 230// }
231 } 231// }
232 } 232// }
233 233
234 /// <summary> 234 /// <summary>
235 /// Check if asset exist in database 235 /// Check if asset exist in database
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 250c803..8a58e71 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -3378,7 +3378,6 @@ if (m_shape != null) {
3378 3378
3379 #endregion Public Methods 3379 #endregion Public Methods
3380 3380
3381
3382 private byte GetAttachPointEncoded() 3381 private byte GetAttachPointEncoded()
3383 { 3382 {
3384 return (byte)((AttachmentPoint % 16) * 16 + (AttachmentPoint / 16)); 3383 return (byte)((AttachmentPoint % 16) * 16 + (AttachmentPoint / 16));