allow group to mod alphagamma on group objects

Author: AndrewMeadows

indra/newview/llpanelface.cpp

@@ -1811,7 +1811,19 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         calcp->clearVar(LLCalc::TEX_TRANSPARENCY);
         calcp->clearVar(LLCalc::TEX_GLOW);
     }
-    if (objectp && (objectp->permModify() || objectp->permYouOwner()))
+
+    bool agent_in_group = false;
+    if (objectp && objectp->permGroupOwner())
+    {
+        LLUUID owner_id;
+        std::string owner_name;
+        LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
+        agent_in_group = gAgent.isInGroup(owner_id);
+    }
+
+    if (objectp && (objectp->permModify()
+                || objectp->permYouOwner()
+                || agent_in_group))
     {
         // AlphaGamma should enabled when modable or owned
         U8   alpha_gamma           = 100;

indra/newview/llselectmgr.cpp

@@ -1730,18 +1730,21 @@ struct LLSelectMgrSendFunctor : public LLSelectedObjectFunctor
 
 struct LLSelectMgrAlphaGammaBypassFunctor : public LLSelectedObjectFunctor
 {
+    LLSelectMgrAlphaGammaBypassFunctor(bool agent_in_group) : mAgentInGroup(agent_in_group) {}
+
     virtual bool apply(LLViewerObject* object)
     {
         if (object->permModify())
         {
             object->sendTEUpdate();
         }
-        else if (object->permYouOwner())
+        else if (object->permYouOwner() || (object->permGroupOwner() && mAgentInGroup))
         {
             LLSelectMgr::packAlphaGammaBypass(object);
         }
         return true;
     }
+    bool mAgentInGroup { false };
 };
 
 void LLObjectSelection::applyNoCopyTextureToTEs(LLViewerInventoryItem* item)
@@ -2340,24 +2343,30 @@ void LLSelectMgr::selectionSetBumpmap(U8 bumpmap, const LLUUID &image_id)
 
 void LLSelectMgr::selectionSetAlphaGamma(U8 gamma)
 {
+    LLUUID owner_id;
+    std::string owner_name;
+    LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
+    bool agent_in_group = gAgent.isInGroup(owner_id);
+
     struct f : public LLSelectedTEFunctor
     {
         U8 mAlphaGamma;
-        f(const U8 &t) : mAlphaGamma(t) {}
+        f(const U8 &t, bool agent_in_group) : mAlphaGamma(t), mAgentInGroup(agent_in_group) {}
         bool apply(LLViewerObject *object, S32 te)
         {
             bool can_modify = object->permModify();
-            if (can_modify || object->permYouOwner())
+            if (can_modify || object->permYouOwner() || (object->permGroupOwner() && mAgentInGroup))
             {
                 // update viewer side color in anticipation of update from simulator
                 object->setTEAlphaGamma(te, mAlphaGamma);
             }
             return true;
         }
-    } setfunc(gamma);
+        bool mAgentInGroup { false };
+    } setfunc(gamma, agent_in_group);
     getSelection()->applyToTEs(&setfunc);
 
-    LLSelectMgrAlphaGammaBypassFunctor sendfunc;
+    LLSelectMgrAlphaGammaBypassFunctor sendfunc(agent_in_group);
     getSelection()->applyToObjects(&sendfunc);
 }