2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index fc6a28f..499ed27 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -33,6 +33,11 @@
                 modified:   linden/indra/newview/llfloatertools.h
                 modified:   linden/indra/newview/llviewermenu.cpp
                 modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+                
+
+     * Fixed tree/grass label not hiding.
+         
+                modified:   linden/indra/newview/llfloatertools.cpp
 
                 
 2009-09-03  Jacek Antonelli  <jacek.antonelli@gmail.com>
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