Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A

# Conflicts:
#	indra/llcommon/llpredicate.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llinventorybridge.cpp

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index f3304a2864..0f395df276 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -370,8 +370,8 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
         return;

     }

 

-    LLCachedControl<bool> debug_invisible(gSavedSettings, "RenderAvatarFriendsOnly", false);

-    if (debug_invisible()

+    static LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false);
+    if (friends_only()
         && !avatarp->isControlAvatar()

         && !avatarp->isSelf()

         && !avatarp->isBuddy())

@@ -723,16 +723,16 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
                             (F32)(pos.mV[VZ]));

              gGL.scalef(0.15f, 0.15f, 0.3f);

 

-             gSphere.renderGGL();

-

-             gGL.popMatrix();

-             gGL.setColorMask(true, false);

-        }

-        // don't render please

-        return;

-    }

-

-    LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false);

+             gSphere.renderGGL();
+
+             gGL.popMatrix();
+             gGL.setColorMask(true, false);
+        }
+        // don't render please
+        return;
+    }
+
+    static LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false);
     if (!single_avatar

         && friends_only()

         && !avatarp->isUIAvatar()