diff options
| author | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
| commit | a160b44e0766329a6c336adcb804cede39e00fc7 (patch) | |
| tree | edf6d5070a0bb9dcba424cf883fe20a7c96af751 /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
| parent | If a transfer request is received for a task inventory item asset, then route... (diff) | |
| parent | minor: remove some commented out code and return ScenePresence.UpdatePriority... (diff) | |
| download | opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.zip opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2 opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz | |
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index c52f60b..373c903 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
| @@ -30,7 +30,7 @@ using System.Data; | |||
| 30 | using System.Reflection; | 30 | using System.Reflection; |
| 31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
| 32 | using log4net; | 32 | using log4net; |
| 33 | using Mono.Data.SqliteClient; | 33 | using Mono.Data.Sqlite; |
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | 36 | ||
| @@ -339,4 +339,4 @@ namespace OpenSim.Data.SQLite | |||
| 339 | 339 | ||
| 340 | #endregion | 340 | #endregion |
| 341 | } | 341 | } |
| 342 | } \ No newline at end of file | 342 | } |