DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen

to resolve conflicts in installer_template.nsi

1 files changed, 29 insertions, 0 deletions

diff --git a/indra/newview/llavatarrendernotifier.h b/indra/newview/llavatarrendernotifier.h
index ec17b3d9e6..37130bfcf6 100644
--- a/indra/newview/llavatarrendernotifier.h
+++ b/indra/newview/llavatarrendernotifier.h
@@ -63,6 +63,25 @@ struct LLHUDComplexity
 
 typedef std::list<LLHUDComplexity> hud_complexity_list_t;
 
+struct LLObjectComplexity
+{
+    LLObjectComplexity()
+    {
+        reset();
+    }
+    void reset()
+    {
+        objectId = LLUUID::null;
+        objectName = "";
+        objectCost = 0;
+    }
+    LLUUID objectId;
+    std::string objectName;
+    U32 objectCost;
+};
+
+typedef std::list<LLObjectComplexity> object_complexity_list_t;
+
 // Class to notify user about drastic changes in agent's render weights or if other agents
 // reported that user's agent is too 'heavy' for their settings
 class LLAvatarRenderNotifier : public LLSingleton<LLAvatarRenderNotifier>
@@ -77,6 +96,9 @@ public:
     void updateNotificationState();
 	void updateNotificationAgent(U32 agentComplexity);
 
+    void setObjectComplexityList(object_complexity_list_t object_list) { mObjectComplexityList = object_list; }
+    object_complexity_list_t getObjectComplexityList() { return mObjectComplexityList; }
+
 private:
 
 	LLNotificationPtr mNotificationPtr;
@@ -109,6 +131,8 @@ private:
     // Used to detect changes in voavatar's rezzed status.
     // If value decreases - there were changes in outfit.
     S32 mLastOutfitRezStatus;
+
+    object_complexity_list_t mObjectComplexityList;
 };
 
 // Class to notify user about heavy set of HUD
@@ -121,6 +145,9 @@ public:
     void updateNotificationHUD(hud_complexity_list_t complexity);
     bool isNotificationVisible();
 
+    hud_complexity_list_t getHUDComplexityList() { return mHUDComplexityList; }
+    S32 getHUDsCount() { return mHUDsCount; }
+
 private:
     enum EWarnLevel
     {
@@ -141,6 +168,8 @@ private:
     EWarnLevel mReportedHUDWarning;
     LLHUDComplexity mLatestHUDComplexity;
     LLFrameTimer mHUDPopUpDelayTimer;
+    hud_complexity_list_t mHUDComplexityList;
+    S32 mHUDsCount;
 };
 
 #endif /* ! defined(LL_llavatarrendernotifier_H) */