diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 259e186..fc05d1d 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -44,7 +44,6 @@ namespace OpenSim.Data.MySQL | |||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private MySQLManager _dbConnection; | 46 | private MySQLManager _dbConnection; |
47 | private long TicksToEpoch; | ||
48 | 47 | ||
49 | #region IPlugin Members | 48 | #region IPlugin Members |
50 | 49 | ||
@@ -61,8 +60,6 @@ namespace OpenSim.Data.MySQL | |||
61 | /// <param name="connect">connect string</param> | 60 | /// <param name="connect">connect string</param> |
62 | override public void Initialise(string connect) | 61 | override public void Initialise(string connect) |
63 | { | 62 | { |
64 | TicksToEpoch = new DateTime(1970,1,1).Ticks; | ||
65 | |||
66 | // TODO: This will let you pass in the connect string in | 63 | // TODO: This will let you pass in the connect string in |
67 | // the config, though someone will need to write that. | 64 | // the config, though someone will need to write that. |
68 | if (connect == String.Empty) | 65 | if (connect == String.Empty) |
@@ -223,7 +220,7 @@ namespace OpenSim.Data.MySQL | |||
223 | using (cmd) | 220 | using (cmd) |
224 | { | 221 | { |
225 | // create unix epoch time | 222 | // create unix epoch time |
226 | int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); | 223 | int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow); |
227 | cmd.Parameters.AddWithValue("?id", asset.ID); | 224 | cmd.Parameters.AddWithValue("?id", asset.ID); |
228 | cmd.Parameters.AddWithValue("?name", assetName); | 225 | cmd.Parameters.AddWithValue("?name", assetName); |
229 | cmd.Parameters.AddWithValue("?description", assetDescription); | 226 | cmd.Parameters.AddWithValue("?description", assetDescription); |
@@ -248,6 +245,9 @@ namespace OpenSim.Data.MySQL | |||
248 | 245 | ||
249 | private void UpdateAccessTime(AssetBase asset) | 246 | private void UpdateAccessTime(AssetBase asset) |
250 | { | 247 | { |
248 | // Writing to the database every time Get() is called on an asset is killing us. Seriously. -jph | ||
249 | return; | ||
250 | |||
251 | lock (_dbConnection) | 251 | lock (_dbConnection) |
252 | { | 252 | { |
253 | _dbConnection.CheckConnection(); | 253 | _dbConnection.CheckConnection(); |
@@ -262,7 +262,7 @@ namespace OpenSim.Data.MySQL | |||
262 | using (cmd) | 262 | using (cmd) |
263 | { | 263 | { |
264 | // create unix epoch time | 264 | // create unix epoch time |
265 | int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); | 265 | int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow); |
266 | cmd.Parameters.AddWithValue("?id", asset.ID); | 266 | cmd.Parameters.AddWithValue("?id", asset.ID); |
267 | cmd.Parameters.AddWithValue("?access_time", now); | 267 | cmd.Parameters.AddWithValue("?access_time", now); |
268 | cmd.ExecuteNonQuery(); | 268 | cmd.ExecuteNonQuery(); |