From dbd361b423d43ce9f7d2694e7766e22bf188ceea Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Wed, 15 Apr 2015 16:44:48 -0400
Subject: [PATCH] Fix build issues after merge
---
indra/newview/llfilepicker.cpp | 13 +++++++------
indra/newview/llfilepicker.h | 15 ++++++++-------
indra/newview/llsidepaneltaskinfo.cpp | 4 ++--
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 65ba13f752..f550bfd6c5 100755
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -720,18 +720,19 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena
extension = "slg";
break;
#endif
- case FFSAVE_CSV:
+
+ case FFSAVE_XML:
type = "\?\?\?\?";
creator = "\?\?\?\?";
- extension = "csv";
+ extension = "xml";
break;
-
- case FFSAVE_XML:
+
+ case FFSAVE_CSV:
type = "\?\?\?\?";
creator = "\?\?\?\?";
- extension = "xml";
+ extension = "csv";
break;
-
+
case FFSAVE_RAW:
type = "\?\?\?\?";
creator = "\?\?\?\?";
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index da2bc81ca4..052dee53af 100755
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -101,13 +101,14 @@ public:
FFSAVE_GEOMETRY = 8,
#endif
FFSAVE_XML = 9,
- FFSAVE_COLLADA = 10,
- FFSAVE_RAW = 11,
- FFSAVE_J2C = 12,
- FFSAVE_PNG = 13,
- FFSAVE_JPEG = 14,
- FFSAVE_SCRIPT = 15,
- FFSAVE_TGAPNG = 16
+ FFSAVE_CSV =10,
+ FFSAVE_COLLADA = 11,
+ FFSAVE_RAW = 12,
+ FFSAVE_J2C = 13,
+ FFSAVE_PNG = 14,
+ FFSAVE_JPEG = 15,
+ FFSAVE_SCRIPT = 16,
+ FFSAVE_TGAPNG = 17
};
// open the dialog. This is a modal operation
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index b0853babbf..1611ba75d0 100755
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -565,12 +565,12 @@ void LLSidepanelTaskInfo::refresh()
getChildView("Edit Cost")->setEnabled(FALSE);
// Don't show a price if none of the items are for sale.
- getChild<LLUICtrl>("Edit Cost")->setValue(num_for_sale
+ getChild<LLSpinCtrl>("Edit Cost")->setValue(num_for_sale
? llformat("%d",total_sale_price)
: LLStringUtil::null);
// If multiple items are for sale, set text to TOTAL PRICE.
- getChild<LLSpinCtrl>("Cost")->>setLabel(getString(num_for_sale > 1
+ getChild<LLSpinCtrl>("Edit Cost")->setLabel(getString(num_for_sale > 1
? "Cost Total"
: "Cost Default"));
}
--
GitLab