1 files changed, 20 insertions, 16 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 7d26f06..4488a46 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -39,7 +39,7 @@
 #include "lldbstrings.h"
 #include "lleconomy.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llpermissions.h"
 #include "llpermissionsflags.h"
 #include "llundo.h"
@@ -62,6 +62,7 @@
 #include "llhudmanager.h"
 #include "llinventorymodel.h"
 #include "llmenugl.h"
+#include "llmutelist.h"
 #include "llstatusbar.h"
 #include "llsurface.h"
 #include "lltool.h"
@@ -1037,19 +1038,21 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
 
         if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount())
         {
-                LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject());
+                //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject());
                 LLBBox bbox = mSavedSelectionBBox;
                 mGridOrigin = mSavedSelectionBBox.getCenterAgent();
                 mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f;
 
-                if(mSelectedObjects->getObjectCount() < 2 || !root || root->mDrawable.isNull())
+                // DEV-12570 Just taking the saved selection box rotation prevents
+                // wild rotations of linked sets while in local grid mode
+                //if(mSelectedObjects->getObjectCount() < 2 || !root || root->mDrawable.isNull())
                 {
                         mGridRotation = mSavedSelectionBBox.getRotation();
                 }
-                else //set to the root object
+                /*else //set to the root object
                 {
                         mGridRotation = root->getRenderRotation();                      
-                }
+                }*/
         }
         else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull())
         {
@@ -2509,11 +2512,7 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id)
                         }
                 }
         }
-        if (first_id.isNull())
-        {
-                return FALSE;
-        }
-        
+
         result_id = first_id;
 
         return identical;
@@ -4443,6 +4442,11 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
                         reporterp->setPickedObjectProperties(name, fullname, owner_id);
                 }
         }
+        else if (request_flags & OBJECT_PAY_REQUEST)
+        {
+                // check if the owner of the paid object is muted
+                LLMuteList::getInstance()->autoRemove(owner_id, LLMuteList::AR_MONEY);
+        }
 
         // Now look through all of the hovered nodes
         struct f : public LLSelectedNodeFunctor
@@ -4780,7 +4784,7 @@ void LLSelectMgr::updateSilhouettes()
                 objectp->clearChanged(LLXform::MOVED | LLXform::SILHOUETTE);
         }
         
-        //glAlphaFunc(GL_GREATER, 0.01f);
+        //gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 }
 
 void LLSelectMgr::renderSilhouettes(BOOL for_hud)
@@ -4792,7 +4796,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 
         LLViewerImage::bindTexture(mSilhouetteImagep);
         LLGLSPipelineSelection gls_select;
-        glAlphaFunc(GL_GREATER, 0.0f);
+        gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
         LLGLEnable blend(GL_BLEND);
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 
@@ -4898,7 +4902,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
         }
 
         mSilhouetteImagep->unbindTexture(0, GL_TEXTURE_2D);
-        glAlphaFunc(GL_GREATER, 0.01f);
+        gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 }
 
 void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
@@ -5263,7 +5267,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                 if (LLSelectMgr::sRenderHiddenSelections) // && gFloaterTools && gFloaterTools->getVisible())
                 {
                         gGL.flush();
-                        gGL.blendFunc(GL_SRC_COLOR, GL_ONE);
+                        gGL.blendFunc(LLRender::BF_SOURCE_COLOR, LLRender::BF_ONE);
                         LLGLEnable fog(GL_FOG);
                         glFogi(GL_FOG_MODE, GL_LINEAR);
                         float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
@@ -5273,7 +5277,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                         glFogfv(GL_FOG_COLOR, fogCol.mV);
 
                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
-                        glAlphaFunc(GL_GREATER, 0.01f);
+                        gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
                         gGL.begin(LLVertexBuffer::LINES);
                         {
                                 S32 i = 0;
@@ -5294,7 +5298,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                 }
 
                 gGL.flush();
-                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                gGL.setSceneBlendType(LLRender::BT_ALPHA);
                 gGL.begin(LLVertexBuffer::TRIANGLES);
                 {
                         S32 i = 0;