diff options
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteXInventoryData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs index 97625a7..5c93f88 100644 --- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs +++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |||
| @@ -41,8 +41,7 @@ namespace OpenSim.Data.SQLite | |||
| 41 | /// </summary> | 41 | /// </summary> |
| 42 | public class SQLiteXInventoryData : IXInventoryData | 42 | public class SQLiteXInventoryData : IXInventoryData |
| 43 | { | 43 | { |
| 44 | private static readonly ILog m_log = LogManager.GetLogger( | 44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 45 | MethodBase.GetCurrentMethod().DeclaringType); | ||
| 46 | 45 | ||
| 47 | private SQLiteGenericTableHandler<XInventoryFolder> m_Folders; | 46 | private SQLiteGenericTableHandler<XInventoryFolder> m_Folders; |
| 48 | private SqliteItemHandler m_Items; | 47 | private SqliteItemHandler m_Items; |