Merge pull request #1774 from secondlife/marchcat/b-merge

Release (Materials featurette) -> Maint B sync

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llagentbenefits.h b/indra/newview/llagentbenefits.h
index 1afc80a6cc..ff23241aa9 100644
--- a/indra/newview/llagentbenefits.h
+++ b/indra/newview/llagentbenefits.h
@@ -30,9 +30,14 @@
 #include "llsd.h"
 #include "llassettype.h"
 
+class LLViewerTexture;
+class LLImageBase;
+
 class LLAgentBenefits
 {
 public:
+    static constexpr S32 MIN_2K_TEXTURE_AREA = 1024 * 1024 + 1;
+
     LLAgentBenefits();
     ~LLAgentBenefits();
     LOG_CLASS(LLAgentBenefits);
@@ -47,6 +52,9 @@ public:
     S32 getPicksLimit() const;
     S32 getSoundUploadCost() const;
     S32 getTextureUploadCost() const;
+    S32 getTextureUploadCost(const LLViewerTexture* tex) const;
+    S32 getTextureUploadCost(const LLImageBase* tex) const;
+    S32 get2KTextureUploadCost(S32 area) const;
 
     bool findUploadCost(LLAssetType::EType& asset_type, S32& cost) const;
 
@@ -59,6 +67,7 @@ private:
     S32 m_picks_limit;
     S32 m_sound_upload_cost;
     S32 m_texture_upload_cost;
+    std::vector<S32> m_2k_texture_upload_cost;
 
     bool m_initalized;
 };