1 files changed, 6 insertions, 22 deletions

diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 4a12870..cb54476 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3068,8 +3068,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 class LLPieMenuBranch : public LLMenuItemGL
 {
 public:
-        LLPieMenuBranch(const LLString& name, const LLString& label, LLPieMenu* branch,
-                                        enabled_callback ecb, void* user_data);
+        LLPieMenuBranch(const LLString& name, const LLString& label, LLPieMenu* branch);
 
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_PIE_MENU_BRANCH; }
         virtual LLString getWidgetTag() const { return LL_PIE_MENU_BRANCH_TAG; }
@@ -3084,19 +3083,13 @@ public:
 
 protected:
         LLPieMenu* mBranch;
-        enabled_callback mEnabledCallback;
-        void* mUserData;
 };
 
 LLPieMenuBranch::LLPieMenuBranch(const LLString& name,
                                                                  const LLString& label,
-                                                                 LLPieMenu* branch,
-                                                                 enabled_callback ecb,
-                                                                 void* user_data) 
+                                                                 LLPieMenu* branch) 
 :       LLMenuItemGL( name, label, KEY_NONE, MASK_NONE ),
-        mBranch( branch ),
-        mEnabledCallback( ecb ),
-        mUserData(user_data)
+        mBranch( branch )
 {
         mBranch->hide(FALSE);
         mBranch->setParentMenuItem(this);
@@ -3105,12 +3098,6 @@ LLPieMenuBranch::LLPieMenuBranch(const LLString& name,
 // called to rebuild the draw label
 void LLPieMenuBranch::buildDrawLabel( void )
 {
-        if(mEnabledCallback)
-        {
-                setEnabled(mEnabledCallback(mUserData));
-                setDrawTextDisabled(FALSE);
-        }
-        else
         {
                 // default enablement is this -- if any of the subitems are
                 // enabled, this item is enabled. JC
@@ -3203,7 +3190,7 @@ void LLPieMenu::initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *fac
                         child->getAttributeString("label", label);
 
                         LLPieMenu *submenu = new LLPieMenu(name, label);
-                        appendMenu(submenu);
+                        appendPieMenu(submenu);
                         submenu->initXML(child, context, factory);
                 }
                 else
@@ -3585,17 +3572,14 @@ BOOL LLPieMenu::appendSeparator(const LLString &separator_name)
 }
 
 
-// virtual
-BOOL LLPieMenu::appendMenu(LLPieMenu *menu,
-                                                   enabled_callback enabled_cb,
-                                                   void* user_data)
+BOOL LLPieMenu::appendPieMenu(LLPieMenu *menu)
 {
         if (menu == this)
         {
                 llerrs << "Can't attach a pie menu to itself" << llendl;
         }
         LLPieMenuBranch *item;
-        item = new LLPieMenuBranch(menu->getName(), menu->getLabel(), menu, enabled_cb, user_data);
+        item = new LLPieMenuBranch(menu->getName(), menu->getLabel(), menu);
         getParent()->addChild(item->getBranch());
         item->setFont( LLFontGL::sSansSerifSmall );
         return append( item );