diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
| commit | 768ef450678a93496fb69012efaa15c915969c47 (patch) | |
| tree | 023ead1927667d4fb11cb56dceadc33694d35937 /indra/newview/llassetuploadresponders.cpp | |
| parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
| parent | 33007699cc701baf0c312ff669e659d874f3ae2f (diff) | |
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rwxr-xr-x | indra/newview/llassetuploadresponders.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index d2b1dcbf35..e492b8cf5d 100755 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -674,6 +674,7 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content) } +#if 0 ///////////////////////////////////////////////////// // LLNewAgentInventoryVariablePriceResponder::Impl // ///////////////////////////////////////////////////// @@ -1144,5 +1145,5 @@ void LLNewAgentInventoryVariablePriceResponder::showConfirmationDialog( LLPointer<LLNewAgentInventoryVariablePriceResponder>(this))); } } - +#endif |