summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetupload.cpp
AgeCommit message (Expand)Author
2015-07-07Automated merge with bundle:C:\Users\admin\AppData\Local\Temp\0d1ig3y4.ke0Rider Linden
2015-07-07MergeRider Linden
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden
2015-07-07Clean up viewrmenufile into viewrassetuplodRider Linden
2015-07-03Remove ambiguous assignment.rider
2015-07-02MergeRider Linden
2015-07-02Adjusting uploadinfo object for expansion.Rider Linden
2015-07-01MAINT-5351: Remove 'self' parameter from coroutine functions.Nat Goodspeed
2015-06-30Initial checkin for uploading via coroutine.Rider Linden