diff options
| author | KittoFlora | 2009-10-27 22:42:55 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-10-27 22:42:55 +0100 |
| commit | 1113b3b6ebba3e358326a7be90b338d8c95af688 (patch) | |
| tree | d923340600e5a2699ceaceeb52fd6c45994f334a /OpenSim/Data/MySQL/MySQLAssetData.cs | |
| parent | llRotLookAt Pt 2 (diff) | |
| parent | Merge branch 'master' into vehicles (diff) | |
| download | opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.zip opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.gz opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.bz2 opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.xz | |
Merge branch 'vehicles' into tests
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index fc05d1d..4d49733 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
| @@ -167,9 +167,6 @@ namespace OpenSim.Data.MySQL | |||
| 167 | asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); | 167 | asset.Temporary = Convert.ToBoolean(dbReader["temporary"]); |
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | |||
| 171 | if (asset != null) | ||
| 172 | UpdateAccessTime(asset); | ||
| 173 | } | 170 | } |
| 174 | catch (Exception e) | 171 | catch (Exception e) |
| 175 | { | 172 | { |