#2965 Indicate when role members aren't loaded

Author: akleshchev

indra/newview/llhudnametag.h

@@ -177,7 +177,6 @@ class LLHUDNameTag : public LLHUDObject
     S32             mMaxLines;
     S32             mOffsetY;
     F32             mRadius;
-    LLVector3                     mLastRenderPosition;
     std::vector<LLHUDTextSegment> mTextSegments;
     std::vector<LLHUDTextSegment> mLabelSegments;
 //  LLFrameTimer    mResizeTimer;

indra/newview/llhudtext.h

@@ -153,7 +153,6 @@ class LLHUDText : public LLHUDObject
     const LLFontGL* mBoldFontp;
     LLRectf         mSoftScreenRect;
     LLVector3       mPositionAgent;
-    LLVector3       mLastRenderPosition;
     LLVector2       mPositionOffset;
     LLVector2       mTargetPositionOffset;
     F32             mMass;

indra/newview/llpanelgrouproles.cpp

@@ -1937,7 +1937,9 @@ LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab()
   : LLPanelGroupSubTab(),
     mRolesList(NULL),
     mAssignedMembersList(NULL),
+    mActionDescription(NULL),
     mAllowedActionsList(NULL),
+    mMembersNotLoadedLbl(NULL),
     mRoleName(NULL),
     mRoleTitle(NULL),
     mRoleDescription(NULL),
@@ -1969,6 +1971,7 @@ bool LLPanelGroupRolesSubTab::postBuildSubTab(LLView* root)
     mAssignedMembersList = parent->getChild<LLNameListCtrl>("role_assigned_members");
     mAllowedActionsList = parent->getChild<LLScrollListCtrl>("role_allowed_actions");
     mActionDescription  = parent->getChild<LLTextEditor>("role_action_description");
+    mMembersNotLoadedLbl = parent->getChild<LLUICtrl>("members_not_loaded");
 
     mRoleName = parent->getChild<LLLineEditor>("role_name");
     mRoleTitle = parent->getChild<LLLineEditor>("role_title");
@@ -2199,12 +2202,18 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
         }
     }
 
-    if ((GC_ROLE_MEMBER_DATA == gc || GC_MEMBER_DATA == gc)
-        && gdatap
-        && gdatap->isMemberDataComplete()
-        && gdatap->isRoleMemberDataComplete())
+    if (gdatap && gdatap->isMemberDataComplete())
     {
-        buildMembersList();
+        if ((GC_ROLE_MEMBER_DATA == gc || GC_MEMBER_DATA == gc)
+            && gdatap->isRoleMemberDataComplete())
+        {
+            buildMembersList();
+        }
+        mMembersNotLoadedLbl->setVisible(false);
+    }
+    else
+    {
+        mMembersNotLoadedLbl->setVisible(true);
     }
 }
 

indra/newview/llpanelgrouproles.h

@@ -301,6 +301,7 @@ class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab
     LLButton*       mDeleteRoleButton;
     LLButton*       mCreateRoleButton;
     LLButton*       mCopyRoleButton;
+    LLUICtrl*       mMembersNotLoadedLbl;
 
     LLUUID  mSelectedRole;
     bool    mHasRoleChange;

indra/newview/skins/default/xui/en/panel_group_roles.xml

@@ -565,6 +565,17 @@ things in this group. There's a broad variety of Abilities.
          right="-1"
          name="role_assigned_members"
          top_pad="0" />
+        <text
+         type="string"
+         height="125"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="members_not_loaded"
+         top_delta="3"
+         width="300">
+             Members are not loaded
+        </text>
         <check_box
          height="15"
          label="Reveal members"