diff options
| author | Melanie | 2013-06-23 01:49:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:49:45 +0100 |
| commit | 936700bda3969bc54166f0d6a3ca81e3d5c42935 (patch) | |
| tree | 6bb97abf25f4a3f22ccb40e3b4be20c551327b09 /OpenSim/Capabilities | |
| parent | Fix prim locking to behave like SL (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.zip opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.gz opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.bz2 opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs index c0ca1e1..2c91328 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 46 | { | 46 | { |
| 47 | public class FetchInventory2Handler | 47 | public class FetchInventory2Handler |
| 48 | { | 48 | { |
| 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 50 | 50 | ||
| 51 | private IInventoryService m_inventoryService; | 51 | private IInventoryService m_inventoryService; |
| 52 | 52 | ||
| @@ -121,4 +121,4 @@ namespace OpenSim.Capabilities.Handlers | |||
| 121 | return llsdItem; | 121 | return llsdItem; |
| 122 | } | 122 | } |
| 123 | } | 123 | } |
| 124 | } | 124 | } \ No newline at end of file |