diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 92f8c51..6e2f7f3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
| @@ -64,11 +64,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 64 | public List<UUID> folders; | 64 | public List<UUID> folders; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | <<<<<<< HEAD | ||
| 68 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
| 69 | ======= | ||
| 70 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 67 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 71 | >>>>>>> avn/ubitvar | ||
| 72 | 68 | ||
| 73 | /// <summary> | 69 | /// <summary> |
| 74 | /// Control whether requests will be processed asynchronously. | 70 | /// Control whether requests will be processed asynchronously. |