diff options
| author | Jacek Antonelli | 2009-04-06 01:29:22 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-04-06 01:29:22 -0500 |
| commit | e06d504a68a72c321794b5e8740ccefcc45f654b (patch) | |
| tree | 24d844d82b77957e763e6bc9a3103e29aa77f5f3 /linden/indra/llui/llfloater.cpp | |
| parent | Apply saved MediaDebugLevel at media init time. (diff) | |
| parent | Cleaned up logic for bad streams (diff) | |
| download | meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.zip meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.gz meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.bz2 meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.xz | |
Merge commit 'mccabe/gst-revamp' into gst-revamp
Diffstat (limited to 'linden/indra/llui/llfloater.cpp')
| -rw-r--r-- | linden/indra/llui/llfloater.cpp | 1 |
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] |