1 files changed, 15 insertions, 39 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 0146f9e..ba24c16 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2307,56 +2307,32 @@ class LLObjectEnableExport : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-                bool new_value = (object != NULL);
-                if (new_value)
-                {
-                        LLVOAvatar* avatar = find_avatar_from_object(object); 
-                        new_value = (avatar == NULL);
-                }
-                if(new_value)
+                LLControlVariable* control = 
+                        gMenuHolder->findControl(userdata["control"].asString());
+
+                LLViewerObject* object =
+                        LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+
+                if((object != NULL) &&
+                   (find_avatar_from_object(object) == NULL))
                 {
-                        
                         struct ff : public LLSelectedNodeFunctor
                         {
-                                ff(const LLSD& data) : LLSelectedNodeFunctor()
-                                ,userdata(data)
-                                {
-
-                                }
-                                const LLSD& userdata;
                                 virtual bool apply(LLSelectNode* node)
                                 {
-                                        if(gAgent.getID()!=node->mPermissions->getCreator())
-                                        {
-                                                return false;
-                                        }
-                                        return true;
+                                        return primbackup::check_perms( node );
                                 }
-                        };
- 
-#ifdef LL_GRID_PERMISSIONS
- 
-                        ff * the_ff=new ff(userdata);
-                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(the_ff,false))
-                        {
-                                        gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
-                        }
-                        else
+                        } func;
+
+                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
                         {
-                                        gMenuHolder->findControl(userdata["control"].asString())->setValue(false);
+                                control->setValue(true);
+                                return true;    
                         }
-                        return true;    
                 }
  
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-#else
-                }
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
+                control->setValue(false);
                 return true;
-#endif
-
         }
 };