From ea75559674a8ac6d48fbf511880b1a79cbb7642d Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 21 Jun 2018 10:33:02 -0700
Subject: Compile issue with merge.  Just use the method default parameters.

---
 indra/newview/llviewermenufile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index d6ef008488..5940e3a2df 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -423,7 +423,7 @@ const void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::
 			LLFloaterPerms::getEveryonePerms("Uploads"),
 			expected_upload_cost));
 
-		upload_new_resource(uploadInfo, NULL, NULL);
+		upload_new_resource(uploadInfo);
 	}
 }
 
-- 
cgit v1.2.3