1 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index ff46a80..ecb6342 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -89,7 +89,16 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
                 LLCHECKBOXCTRL_VPAD + 1, // padding to get better alignment
                 text_width + LLCHECKBOXCTRL_HPAD,
                 text_height );
-        mLabel = new LLTextBox( "CheckboxCtrl Label", label_rect, label.c_str(), mFont );
+
+        // *HACK Get rid of this with SL-55508... 
+        // this allows blank check boxes and radio boxes for now
+        LLString local_label = label;
+        if(local_label.empty())
+        {
+                local_label = " ";
+        }
+
+        mLabel = new LLTextBox( "CheckboxCtrl Label", label_rect, local_label.c_str(), mFont );
         mLabel->setFollowsLeft();
         mLabel->setFollowsBottom();
         addChild(mLabel);
@@ -212,7 +221,7 @@ void LLCheckBoxCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLCheckBoxCtrl::draw()
 {
-        if (mEnabled)
+        if (getEnabled())
         {
                 mLabel->setColor( mTextEnabledColor );
         }