From 95a686dbf5fce50b332c16231e5ebfdd07add0e4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Nov 2011 23:45:29 +0000
Subject: Fix config so that you can have both WebFetchInventoryDescendents and
 FetchInvnetoryDescendents2 caps active at once

---
 OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index a49d619..72177a8 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -121,7 +121,8 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             if (m_webFetchInventoryDescendentsUrl != "")
                 RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl);
-            else if (m_fetchInventoryDescendents2Url != "")
+
+            if (m_fetchInventoryDescendents2Url != "")
                 RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
         }
 
-- 
cgit v1.1