aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-06 01:51:38 -0500
committerJacek Antonelli2009-04-06 01:52:15 -0500
commitbcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937 (patch)
tree7b2154384c2d1339c6c030e237e3ea6ba7e19e94 /linden/indra/llui/llfloater.cpp
parentChanged the login splash screen URL. (diff)
parentMerge branch gst-thread into gst-revamp (diff)
downloadmeta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.zip
meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.gz
meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.bz2
meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.xz
Merge branch 'gst-revamp' into next
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llfloater.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 9f8cd65..2f4e873 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1580,6 +1580,7 @@ void LLFloater::updateButtons()
1580 S32 button_count = 0; 1580 S32 button_count = 0;
1581 for (S32 i = 0; i < BUTTON_COUNT; i++) 1581 for (S32 i = 0; i < BUTTON_COUNT; i++)
1582 { 1582 {
1583 if(!mButtons[i]) continue;
1583 mButtons[i]->setEnabled(mButtonsEnabled[i]); 1584 mButtons[i]->setEnabled(mButtonsEnabled[i]);
1584 1585
1585 if (mButtonsEnabled[i] 1586 if (mButtonsEnabled[i]