diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
commit | 3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch) | |
tree | a461ec6fc7412cff158635afffb0c4336fcac470 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
parent | 3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff) | |
parent | 3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff) |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
-rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index eab8f187a7..570e48d526 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -181,7 +181,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetch() if (mBackgroundFetchActive && gAgent.getRegion()) { // If we'll be using the capability, we'll be sending batches and the background thing isn't as important. - std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents"); + std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents2"); if (!url.empty()) { bulkFetch(url); @@ -604,7 +604,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch(std::string url) } if (body_lib["folders"].size()) { - std::string url_lib = gAgent.getRegion()->getCapability("FetchLibDescendents"); + std::string url_lib = gAgent.getRegion()->getCapability("FetchLibDescendents2"); LLInventoryModelFetchDescendentsResponder *fetcher = new LLInventoryModelFetchDescendentsResponder(body_lib, recursive_cats); LLHTTPClient::post(url_lib, body_lib, fetcher, 300.0); |