diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Data/MySQL/MySQLXInventoryData.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
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 | ||