viewer#1081 Account for 2K texture upload price in bulk upload

1 files changed, 77 insertions, 27 deletions

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 60956fab03..6fe5ef00ab 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -546,21 +546,50 @@ void do_bulk_upload(std::vector<std::string> filenames, const LLSD& notification
 		std::string ext = gDirUtilp->getExtension(filename);
 		LLAssetType::EType asset_type;
 		U32 codec;
-		S32 expected_upload_cost;
-		if (LLResourceUploadInfo::findAssetTypeAndCodecOfExtension(ext, asset_type, codec) &&
-			LLAgentBenefitsMgr::current().findUploadCost(asset_type, expected_upload_cost))
-		{
-            LLResourceUploadInfo::ptr_t uploadInfo(new LLNewFileResourceUploadInfo(
-                filename,
-                asset_name,
-                asset_name, 0,
-                LLFolderType::FT_NONE, LLInventoryType::IT_NONE,
-                LLFloaterPerms::getNextOwnerPerms("Uploads"),
-                LLFloaterPerms::getGroupPerms("Uploads"),
-                LLFloaterPerms::getEveryonePerms("Uploads"),
-                expected_upload_cost));
-
-            upload_new_resource(uploadInfo);
+		S32 expected_upload_cost = 0;
+
+        if (LLResourceUploadInfo::findAssetTypeAndCodecOfExtension(ext, asset_type, codec))
+        {
+            bool resource_upload = false;
+            if (asset_type == LLAssetType::AT_TEXTURE)
+            {
+                LLPointer<LLImageFormatted> image_frmted = LLImageFormatted::createFromType(codec);
+                if (gDirUtilp->fileExists(filename) && image_frmted->load(filename))
+                {
+                    if (image_frmted->getWidth() * image_frmted->getHeight() >= LLAgentBenefits::MIN_2K_TEXTURE_AREA)
+                    {
+                        expected_upload_cost = LLAgentBenefitsMgr::current().get2KTextureUploadCost();
+                        if (expected_upload_cost >= 0)
+                        {
+                            resource_upload = true;
+                        }
+                    }
+                    else
+                    {
+                        expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
+                        resource_upload = true;
+                    }
+                }
+            }
+            else if (LLAgentBenefitsMgr::current().findUploadCost(asset_type, expected_upload_cost))
+            {
+                resource_upload = true;
+            }
+
+            if (resource_upload)
+            {
+                LLResourceUploadInfo::ptr_t uploadInfo(new LLNewFileResourceUploadInfo(
+                    filename,
+                    asset_name,
+                    asset_name, 0,
+                    LLFolderType::FT_NONE, LLInventoryType::IT_NONE,
+                    LLFloaterPerms::getNextOwnerPerms("Uploads"),
+                    LLFloaterPerms::getGroupPerms("Uploads"),
+                    LLFloaterPerms::getEveryonePerms("Uploads"),
+                    expected_upload_cost));
+
+                upload_new_resource(uploadInfo);
+            }
         }
 
         // gltf does not use normal upload procedure
@@ -588,6 +617,8 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3
 	total_cost = 0;
 	file_count = 0;
 	bvh_count = 0;
+    S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
+    S32 texture_2k_upload_cost = LLAgentBenefitsMgr::current().get2KTextureUploadCost();
 	for (std::vector<std::string>::const_iterator in_iter = filenames.begin(); in_iter != filenames.end(); ++in_iter)
 	{
 		std::string filename = (*in_iter);
@@ -602,18 +633,37 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3
 		U32 codec;
 		S32 cost;
 
-		if (LLResourceUploadInfo::findAssetTypeAndCodecOfExtension(ext, asset_type, codec) &&
-			LLAgentBenefitsMgr::current().findUploadCost(asset_type, cost))
+		if (LLResourceUploadInfo::findAssetTypeAndCodecOfExtension(ext, asset_type, codec))
 		{
-			total_cost += cost;
-			file_count++;
-		}
+            if (asset_type == LLAssetType::AT_TEXTURE)
+            {
+                LLPointer<LLImageFormatted> image_frmted = LLImageFormatted::createFromType(codec);
+                if (gDirUtilp->fileExists(filename) && image_frmted->load(filename))
+                {
+                    if (image_frmted->getWidth() * image_frmted->getHeight() >= LLAgentBenefits::MIN_2K_TEXTURE_AREA)
+                    {
+                        if (texture_2k_upload_cost >= 0)
+                        {
+                            total_cost += texture_2k_upload_cost;
+                            file_count++;
+                        }
+                    }
+                    else
+                    {
+                        total_cost += texture_upload_cost;
+                        file_count++;
+                    }
+                }
+            }
+            else if (LLAgentBenefitsMgr::current().findUploadCost(asset_type, cost))
+            {
+                total_cost += cost;
+                file_count++;
+            }
+        }
 
         if (ext == "gltf" || ext == "glb")
         {
-            S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
-            S32 texture_2k_upload_cost = LLAgentBenefitsMgr::current().get2KTextureUploadCost();
-            
             tinygltf::Model model;
 
             if (LLTinyGLTFHelper::loadModel(filename, model))
@@ -634,7 +684,7 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3
                         S32 texture_2k_count = 0;
                         if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR].notNull() && material->mBaseColorTexture)
                         {
-                            if (material->mBaseColorTexture->getFullHeight() * material->mBaseColorTexture->getFullWidth() > LLAgentBenefits::MIN_2K_TEXTURE_AREA)
+                            if (material->mBaseColorTexture->getFullHeight() * material->mBaseColorTexture->getFullWidth() >= LLAgentBenefits::MIN_2K_TEXTURE_AREA)
                             {
                                 texture_2k_count++;
                             }
@@ -645,7 +695,7 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3
                         }
                         if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_METALLIC_ROUGHNESS].notNull() && material->mMetallicRoughnessTexture)
                         {
-                            if (material->mMetallicRoughnessTexture->getFullHeight() * material->mMetallicRoughnessTexture->getFullWidth() > LLAgentBenefits::MIN_2K_TEXTURE_AREA)
+                            if (material->mMetallicRoughnessTexture->getFullHeight() * material->mMetallicRoughnessTexture->getFullWidth() >= LLAgentBenefits::MIN_2K_TEXTURE_AREA)
                             {
                                 texture_2k_count++;
                             }
@@ -656,7 +706,7 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3
                         }
                         if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_NORMAL].notNull() && material->mNormalTexture)
                         {
-                            if (material->mNormalTexture->getFullHeight() * material->mNormalTexture->getFullWidth() > LLAgentBenefits::MIN_2K_TEXTURE_AREA)
+                            if (material->mNormalTexture->getFullHeight() * material->mNormalTexture->getFullWidth() >= LLAgentBenefits::MIN_2K_TEXTURE_AREA)
                             {
                                 texture_2k_count++;
                             }
@@ -667,7 +717,7 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3
                         }
                         if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_EMISSIVE].notNull() && material->mEmissiveTexture)
                         {
-                            if (material->mEmissiveTexture->getFullHeight() * material->mEmissiveTexture->getFullWidth() > LLAgentBenefits::MIN_2K_TEXTURE_AREA)
+                            if (material->mEmissiveTexture->getFullHeight() * material->mEmissiveTexture->getFullWidth() >= LLAgentBenefits::MIN_2K_TEXTURE_AREA)
                             {
                                 texture_2k_count++;
                             }