1 files changed, 10 insertions, 6 deletions

diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 2265ed5..4d138d4 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpanelcontents.cpp
  * @brief Object contents panel in the tools floater.
  *
@@ -101,21 +101,25 @@ LLPanelContents::~LLPanelContents()
 void LLPanelContents::getState(LLViewerObject *objectp )
 {
         if( !objectp )
-        {       
+        {
                 childSetEnabled("button new script",FALSE);
                 //mBtnNewScript->setEnabled( FALSE );
                 return;
         }
 
+        LLUUID group_id;                        // used for SL-23488
+        gSelectMgr->selectGetGroup(group_id);  // sets group_id as a side effect SL-23488
+
         // BUG? Check for all objects being editable?
-        BOOL editable = gAgent.isGodlike() 
-                                        || (objectp->permModify() && objectp->permYouOwner());
+        BOOL editable = gAgent.isGodlike()
+                                        || (objectp->permModify()
+                                               && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
         BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
 
         // Edit script button - ok if object is editable and there's an
         // unambiguous destination for the object.
-        if(     editable && 
-                all_volume && 
+        if(     editable &&
+                all_volume &&
                 ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
                                         || (gSelectMgr->getSelection()->getObjectCount() == 1)))
         {