aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-25 23:45:29 +0000
committerJustin Clark-Casey (justincc)2011-11-25 23:45:29 +0000
commit95a686dbf5fce50b332c16231e5ebfdd07add0e4 (patch)
tree2265d0dd590d4936ce151e47cd7749798f0d0fa7 /OpenSim/Region
parentResolve error where an unknown asset type would cause the fetch inventory des... (diff)
downloadopensim-SC_OLD-95a686dbf5fce50b332c16231e5ebfdd07add0e4.zip
opensim-SC_OLD-95a686dbf5fce50b332c16231e5ebfdd07add0e4.tar.gz
opensim-SC_OLD-95a686dbf5fce50b332c16231e5ebfdd07add0e4.tar.bz2
opensim-SC_OLD-95a686dbf5fce50b332c16231e5ebfdd07add0e4.tar.xz
Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs3
1 files changed, 2 insertions, 1 deletions
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
121 { 121 {
122 if (m_webFetchInventoryDescendentsUrl != "") 122 if (m_webFetchInventoryDescendentsUrl != "")
123 RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl); 123 RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl);
124 else if (m_fetchInventoryDescendents2Url != "") 124
125 if (m_fetchInventoryDescendents2Url != "")
125 RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url); 126 RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
126 } 127 }
127 128