From 4c41534bb5aace61c05e22d675a104e0173d3098 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Sep 2009 19:19:24 -0700
Subject: Fixed tree/grass label not hiding

---
 linden/indra/newview/llfloatertools.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index a99227d..f3ffbe4 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -1043,15 +1043,15 @@ void LLFloaterTools::onFocusReceived()
 
 void LLFloaterTools::updateTreeGrassCombo(bool visible)
 {
+	LLTextBox* tree_grass_label = getChild<LLTextBox>("tree_grass_label");
 	if (visible) 
 	{
 		LLPCode pcode = LLToolPlacer::getObjectType();
 		std::map<std::string, S32>::iterator it, end;
 		std::string selected;
-		LLTextBox* tree_grass_label = getChild<LLTextBox>("tree_grass_label");
 		if (pcode == LLToolPlacerPanel::sTree) 
 		{
-			tree_grass_label->setVisible(true);
+			tree_grass_label->setVisible(visible);
 			LLButton* button = getChild<LLButton>("ToolTree");
 			tree_grass_label->setText(button->getToolTip());
 
@@ -1061,7 +1061,7 @@ void LLFloaterTools::updateTreeGrassCombo(bool visible)
 		} 
 		else if (pcode == LLToolPlacerPanel::sGrass) 
 		{
-			tree_grass_label->setVisible(true);
+			tree_grass_label->setVisible(visible);
 			LLButton* button = getChild<LLButton>("ToolGrass");
 			tree_grass_label->setText(button->getToolTip());
 
@@ -1097,6 +1097,7 @@ void LLFloaterTools::updateTreeGrassCombo(bool visible)
 	}
 	
 	mComboTreesGrass->setVisible(visible);
+	tree_grass_label->setVisible(visible);
 }
 
 // static
-- 
cgit v1.1