diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 | 
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 | 
| commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
| tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
| parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
| parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) | |
Automated merge up from viewer-development
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); | 
