diff options
| author | Melanie | 2010-03-02 04:43:36 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-02 04:46:13 +0000 |
| commit | bef311dfb9692ffefcafa5752e6da4d0823c8773 (patch) | |
| tree | 56efb8190b32ad9b80eef9b15990ef44920d338e /OpenSim/Data/MySQL/MySQLXInventoryData.cs | |
| parent | Changed the query in GetFriends in SQLite to match the one in MySql. (diff) | |
| parent | Fix a few compiler warnings. (diff) | |
| download | opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.zip opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.gz opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.bz2 opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.xz | |
Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLXInventoryData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLXInventoryData.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs index b5866cb..307a4c7 100644 --- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs | |||
| @@ -41,9 +41,6 @@ namespace OpenSim.Data.MySQL | |||
| 41 | /// </summary> | 41 | /// </summary> |
| 42 | public class MySQLXInventoryData : IXInventoryData | 42 | public class MySQLXInventoryData : IXInventoryData |
| 43 | { | 43 | { |
| 44 | private static readonly ILog m_log = LogManager.GetLogger( | ||
| 45 | MethodBase.GetCurrentMethod().DeclaringType); | ||
| 46 | |||
| 47 | private MySQLGenericTableHandler<XInventoryFolder> m_Folders; | 44 | private MySQLGenericTableHandler<XInventoryFolder> m_Folders; |
| 48 | private MySqlItemHandler m_Items; | 45 | private MySqlItemHandler m_Items; |
| 49 | 46 | ||