Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint

# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml

1 files changed, 15 insertions, 16 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 5f18fad9d5..f55dbacd2a 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -73,7 +73,6 @@
 
 #include "llavatarappearancedefines.h"
 
-
 static const S32 LOCAL_TRACKING_ID_COLUMN = 1;
 
 //static const char CURRENT_IMAGE_NAME[] = "Current Texture";
@@ -395,7 +394,7 @@ BOOL LLFloaterTexturePicker::postBuild()
 
 		
 
-		if (!mImageAssetID.isNull())
+		if(!mImageAssetID.isNull())
 		{
 			mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
 		}
@@ -756,27 +755,27 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem
 void LLFloaterTexturePicker::onModeSelect(LLUICtrl* ctrl, void *userdata)
 {
 	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-	U32 mode = self->mModeSelector->getValue().asInteger();
+	int index = self->mModeSelector->getSelectedIndex();
 
-	self->getChild<LLButton>("Default")->setVisible(mode == 0);
-	self->getChild<LLButton>("Blank")->setVisible(mode == 0);
-	self->getChild<LLButton>("None")->setVisible(mode == 0);
-	self->getChild<LLButton>("Pipette")->setVisible(mode == 0);
-	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(mode == 0);
-	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(mode == 0);
+	self->getChild<LLButton>("Default")->setVisible(index == 0 ? TRUE : FALSE);
+	self->getChild<LLButton>("Blank")->setVisible(index == 0 ? TRUE : FALSE);
+	self->getChild<LLButton>("None")->setVisible(index == 0 ? TRUE : FALSE);
+	self->getChild<LLButton>("Pipette")->setVisible(index == 0 ? TRUE : FALSE);
+	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(index == 0 ? TRUE : FALSE);
+	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(index == 0 ? TRUE : FALSE);
 
 	/*self->getChild<LLCheckBox>("show_folders_check")->setVisible(mode);
 	  no idea under which conditions the above is even shown, needs testing. */
 
-	self->getChild<LLButton>("l_add_btn")->setVisible(mode == 1);
-	self->getChild<LLButton>("l_rem_btn")->setVisible(mode == 1);
-	self->getChild<LLButton>("l_upl_btn")->setVisible(mode == 1);
-	self->getChild<LLScrollListCtrl>("l_name_list")->setVisible(mode == 1);
+	self->getChild<LLButton>("l_add_btn")->setVisible(index == 1 ? TRUE : FALSE);
+	self->getChild<LLButton>("l_rem_btn")->setVisible(index == 1 ? TRUE : FALSE);
+	self->getChild<LLButton>("l_upl_btn")->setVisible(index == 1 ? TRUE : FALSE);
+	self->getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == 1 ? TRUE : FALSE);
 
-	self->getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(mode == 2);
-	self->getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(false);// mode == 2);
+	self->getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == 2 ? TRUE : FALSE);
+	self->getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(FALSE);// index == 2 ? TRUE : FALSE);
 
-	if (mode == 2)
+	if (index == 2)
 	{
 		self->stopUsingPipette();