diff options
| author | McCabe Maxsted | 2009-03-04 12:50:59 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-03-04 12:50:59 -0700 |
| commit | f3de7ecf37cd83c23d15ea12e112be9600e33ece (patch) | |
| tree | adac53f3d9b87bd87fd081b1722781d071c8ebff /linden/indra/llui/llfloater.cpp | |
| parent | Backported fix for VWR-6744 (No way to hide IMs in chat console) (diff) | |
| parent | Applied my patch for VWR-8454 (PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not hig... (diff) | |
| download | meta-impy-f3de7ecf37cd83c23d15ea12e112be9600e33ece.zip meta-impy-f3de7ecf37cd83c23d15ea12e112be9600e33ece.tar.gz meta-impy-f3de7ecf37cd83c23d15ea12e112be9600e33ece.tar.bz2 meta-impy-f3de7ecf37cd83c23d15ea12e112be9600e33ece.tar.xz | |
Merge branch 'cvpatches' into next
Diffstat (limited to '')
| -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] |