diff options
author | Justin Clark-Casey (justincc) | 2011-11-25 23:43:57 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-25 23:43:57 +0000 |
commit | 5b4fe23f7f1877a150ed50dd63beaac762fe8674 (patch) | |
tree | 1f8a9a9c9acfd04dd76c02c61c4eb370a9be5d17 /OpenSim/Region/ClientStack/Linden | |
parent | Implement the FetchInventoryDescendents2 capability using the same code as We... (diff) | |
download | opensim-SC_OLD-5b4fe23f7f1877a150ed50dd63beaac762fe8674.zip opensim-SC_OLD-5b4fe23f7f1877a150ed50dd63beaac762fe8674.tar.gz opensim-SC_OLD-5b4fe23f7f1877a150ed50dd63beaac762fe8674.tar.bz2 opensim-SC_OLD-5b4fe23f7f1877a150ed50dd63beaac762fe8674.tar.xz |
Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail.
Introduced just a few commits ago in 0688861
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 2a41b87..a49d619 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -48,8 +48,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
49 | public class WebFetchInvDescModule : INonSharedRegionModule | 49 | public class WebFetchInvDescModule : INonSharedRegionModule |
50 | { | 50 | { |
51 | private static readonly ILog m_log = | 51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
53 | 52 | ||
54 | private Scene m_scene; | 53 | private Scene m_scene; |
55 | 54 | ||
@@ -120,8 +119,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
120 | 119 | ||
121 | private void RegisterCaps(UUID agentID, Caps caps) | 120 | private void RegisterCaps(UUID agentID, Caps caps) |
122 | { | 121 | { |
123 | UUID capID = UUID.Random(); | ||
124 | |||
125 | if (m_webFetchInventoryDescendentsUrl != "") | 122 | if (m_webFetchInventoryDescendentsUrl != "") |
126 | RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl); | 123 | RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl); |
127 | else if (m_fetchInventoryDescendents2Url != "") | 124 | else if (m_fetchInventoryDescendents2Url != "") |