From e66e31f380563962429c8b285f1aa5dabf8ea5d2 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sat, 22 Feb 2020 19:24:13 +0200
Subject: post-merge buildfix

---
 indra/newview/llfloatermodelpreview.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index d7fea67e60..c359722431 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -235,6 +235,7 @@ private:
 	void modelUpdated(bool calculate_visible);
 
 	// Toggles between "Calculate weights & fee" and "Upload" buttons.
+    void toggleCalculateButton();
 	void toggleCalculateButton(bool visible);
 
 	// resets display options of model preview to their defaults.
-- 
cgit v1.2.3