2 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d6d0f90..5fdd770 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -21,6 +21,9 @@
         * linden/indra/newview/pipeline.cpp:
         Backported possible crash fix while changing graphics settings from 1.22.
 
+        * linden/indra/llui/llfloater.cpp:
+        Backported possible crash fix in llfloater.cpp from 1.22.
+
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.1.0 RC2                        -=
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()
         S32 button_count = 0;
         for (S32 i = 0; i < BUTTON_COUNT; i++)
         {
+                if(!mButtons[i]) continue;
                 mButtons[i]->setEnabled(mButtonsEnabled[i]);
 
                 if (mButtonsEnabled[i]