diff options
| author | Melanie | 2013-06-23 01:59:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:59:57 +0100 |
| commit | f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch) | |
| tree | ffda32c340bd7f6d69652e9d9a959c7396f42a2f /OpenSim/Capabilities | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
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 c305797..d1503ee 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 |