diff options
author | McCabe Maxsted | 2009-09-04 19:19:24 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-04 19:19:24 -0700 |
commit | 4c41534bb5aace61c05e22d675a104e0173d3098 (patch) | |
tree | 13c9ee23c838e7b081d0a1b34dc9cab36c5f9d13 /linden/indra | |
parent | Integrated 1.23's tool floater with link/unlink buttons (diff) | |
download | meta-impy-4c41534bb5aace61c05e22d675a104e0173d3098.zip meta-impy-4c41534bb5aace61c05e22d675a104e0173d3098.tar.gz meta-impy-4c41534bb5aace61c05e22d675a104e0173d3098.tar.bz2 meta-impy-4c41534bb5aace61c05e22d675a104e0173d3098.tar.xz |
Fixed tree/grass label not hiding
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llfloatertools.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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() | |||
1043 | 1043 | ||
1044 | void LLFloaterTools::updateTreeGrassCombo(bool visible) | 1044 | void LLFloaterTools::updateTreeGrassCombo(bool visible) |
1045 | { | 1045 | { |
1046 | LLTextBox* tree_grass_label = getChild<LLTextBox>("tree_grass_label"); | ||
1046 | if (visible) | 1047 | if (visible) |
1047 | { | 1048 | { |
1048 | LLPCode pcode = LLToolPlacer::getObjectType(); | 1049 | LLPCode pcode = LLToolPlacer::getObjectType(); |
1049 | std::map<std::string, S32>::iterator it, end; | 1050 | std::map<std::string, S32>::iterator it, end; |
1050 | std::string selected; | 1051 | std::string selected; |
1051 | LLTextBox* tree_grass_label = getChild<LLTextBox>("tree_grass_label"); | ||
1052 | if (pcode == LLToolPlacerPanel::sTree) | 1052 | if (pcode == LLToolPlacerPanel::sTree) |
1053 | { | 1053 | { |
1054 | tree_grass_label->setVisible(true); | 1054 | tree_grass_label->setVisible(visible); |
1055 | LLButton* button = getChild<LLButton>("ToolTree"); | 1055 | LLButton* button = getChild<LLButton>("ToolTree"); |
1056 | tree_grass_label->setText(button->getToolTip()); | 1056 | tree_grass_label->setText(button->getToolTip()); |
1057 | 1057 | ||
@@ -1061,7 +1061,7 @@ void LLFloaterTools::updateTreeGrassCombo(bool visible) | |||
1061 | } | 1061 | } |
1062 | else if (pcode == LLToolPlacerPanel::sGrass) | 1062 | else if (pcode == LLToolPlacerPanel::sGrass) |
1063 | { | 1063 | { |
1064 | tree_grass_label->setVisible(true); | 1064 | tree_grass_label->setVisible(visible); |
1065 | LLButton* button = getChild<LLButton>("ToolGrass"); | 1065 | LLButton* button = getChild<LLButton>("ToolGrass"); |
1066 | tree_grass_label->setText(button->getToolTip()); | 1066 | tree_grass_label->setText(button->getToolTip()); |
1067 | 1067 | ||
@@ -1097,6 +1097,7 @@ void LLFloaterTools::updateTreeGrassCombo(bool visible) | |||
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | mComboTreesGrass->setVisible(visible); | 1099 | mComboTreesGrass->setVisible(visible); |
1100 | tree_grass_label->setVisible(visible); | ||
1100 | } | 1101 | } |
1101 | 1102 | ||
1102 | // static | 1103 | // static |