diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:46:51 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:46:51 -0400 |
commit | d215de3b7d672dcb5da41600c2b5d0abe2cb82ce (patch) | |
tree | eb12d68e18684eb5dd6f4cb309c039f5bc52ed11 /indra/newview/llviewermenufile.cpp | |
parent | 91f636f23a6db27c4ca4c5df2325a7053ca3044e (diff) | |
parent | 68f42e4e102bd578386aeec3485233e332cbdcff (diff) |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
-rwxr-xr-x | indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index e086ee9180..9c4045fa1e 100755 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -792,7 +792,7 @@ void upload_new_resource( if ( !url.empty() ) { - LLCoprocedureManager::CoProcedure_t proc = boost::bind(&LLViewerAssetUpload::AssetInventoryUploadCoproc, _1, _2, _3, url, uploadInfo); + LLCoprocedureManager::CoProcedure_t proc = boost::bind(&LLViewerAssetUpload::AssetInventoryUploadCoproc, _1, _2, url, uploadInfo); LLCoprocedureManager::getInstance()->enqueueCoprocedure("LLViewerAssetUpload::AssetInventoryUploadCoproc", proc); } |