Second Life viewer sources 1.21.0-RC

1 files changed, 63 insertions, 69 deletions

diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 2691f71..2d40e94 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -34,6 +34,7 @@
 #include "llassetuploadresponders.h"
 
 #include "llagent.h"
+#include "llcompilequeue.h"
 #include "llfloaterbuycurrency.h"
 #include "lleconomy.h"
 #include "llfilepicker.h"
@@ -73,10 +74,12 @@ LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
 }
 
 LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
-                                                                                           const std::string& file_name)
+                                                                                           const std::string& file_name, 
+                                                                                           LLAssetType::EType asset_type)
         : LLHTTPClient::Responder(),
           mPostData(post_data),
-          mFileName(file_name)
+          mFileName(file_name),
+          mAssetType(asset_type)
 {
 }
 
@@ -85,7 +88,7 @@ LLAssetUploadResponder::~LLAssetUploadResponder()
         if (!mFileName.empty())
         {
                 // Delete temp file
-                LLFile::remove(mFileName.c_str());
+                LLFile::remove(mFileName);
         }
 }
 
@@ -94,7 +97,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 {
         llinfos << "LLAssetUploadResponder::error " << statusNum 
                         << " reason: " << reason << llendl;
-        LLStringBase<char>::format_map_t args;
+        LLStringUtil::format_map_t args;
         switch(statusNum)
         {
                 case 400:
@@ -163,7 +166,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
         }
         else
         {
-                LLStringBase<char>::format_map_t args;
+                LLStringUtil::format_map_t args;
                 args["[FILE]"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
                 args["[REASON]"] = content["message"].asString();
                 gViewerWindow->alertXml("CannotUploadReason", args);
@@ -181,8 +184,8 @@ LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data
 {
 }
 
-LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name)
-: LLAssetUploadResponder(post_data, file_name)
+LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name, LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type)
 {
 }
 
@@ -191,8 +194,8 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 {
         lldebugs << "LLNewAgentInventoryResponder::result from capabilities" << llendl;
 
-        LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString().c_str());
-        LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString().c_str());
+        LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString());
+        LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString());
 
         // Update L$ and ownership credit information
         // since it probably changed on the server
@@ -208,7 +211,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
                 gMessageSystem->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
                 gAgent.sendReliableMessage();
 
-                LLString::format_map_t args;
+                LLStringUtil::format_map_t args;
                 args["[AMOUNT]"] = llformat("%d",LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
                 LLNotifyBox::showXml("UploadPayment", args);
         }
@@ -275,27 +278,16 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
         // *FIX: This is a pretty big hack. What this does is check the
         // file picker if there are any more pending uploads. If so,
         // upload that file.
-        const char* next_file = LLFilePicker::instance().getNextFile();
-        if(next_file)
+        std::string next_file = LLFilePicker::instance().getNextFile();
+        if(!next_file.empty())
         {
-                const char* name = LLFilePicker::instance().getDirname();
-
-                LLString asset_name = name;
-                LLString::replaceNonstandardASCII( asset_name, '?' );
-                LLString::replaceChar(asset_name, '|', '?');
-                LLString::stripNonprintable(asset_name);
-                LLString::trim(asset_name);
+                std::string name = gDirUtilp->getBaseFileName(next_file, true);
 
-                char* asset_name_str = (char*)asset_name.c_str();
-                char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
-                if( !end_p )
-                {
-                         end_p = asset_name_str + strlen( asset_name_str );                     /*Flawfinder: ignore*/
-                }
-                        
-                S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
-
-                asset_name = asset_name.substr( 0, len );
+                std::string asset_name = name;
+                LLStringUtil::replaceNonstandardASCII( asset_name, '?' );
+                LLStringUtil::replaceChar(asset_name, '|', '?');
+                LLStringUtil::stripNonprintable(asset_name);
+                LLStringUtil::trim(asset_name);
 
                 upload_new_resource(next_file, asset_name, asset_name,
                                                         0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
@@ -311,8 +303,9 @@ LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& pos
 }
 
 LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& post_data,
-                                                                                                                                 const std::string& file_name)
-: LLAssetUploadResponder(post_data, file_name)
+                                                                                                                                 const std::string& file_name,
+                                                                                                                                 LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type)
 {
 }
 
@@ -420,8 +413,17 @@ LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_
 }
 
 LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
-                                                                                                                           const std::string& file_name)
-: LLAssetUploadResponder(post_data, file_name)
+                                                                                                                           const std::string& file_name, 
+                                                                                                                           LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                                                                           const std::string& file_name,
+                                                                                                                           const LLUUID& queue_id, 
+                                                                                                                           LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type), mQueueId(queue_id)
 {
 }
 
@@ -432,35 +434,16 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
         LLUUID item_id = mPostData["item_id"];
         LLUUID task_id = mPostData["task_id"];
 
-        LLViewerObject* object = gObjectList.findObject(task_id);
-        if (!object)
-        {
-                llwarns << "LLUpdateTaskInventoryResponder::uploadComplete task " << task_id
-                        << " no longer exist." << llendl;
-                return;
-        }
-        LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(item_id);
-        if (!item)
-        {
-                llwarns << "LLUpdateTaskInventoryResponder::uploadComplete item "
-                        << item_id << " is no longer in task " << task_id
-                        << "'s inventory." << llendl;
-                return;
-        }
-        LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-        // Update Viewer inventory
-        object->updateViewerInventoryAsset(new_item, content["new_asset"]);
         dialog_refresh_all();
         
-        LLInventoryType::EType inventory_type = new_item->getInventoryType();
-        switch(inventory_type)
+        switch(mAssetType)
         {
-                case LLInventoryType::IT_NOTECARD:
+                case LLAssetType::AT_NOTECARD:
                         {
 
                                 // Update the UI with the new asset.
                                 LLPreviewNotecard* nc;
-                                nc = (LLPreviewNotecard*)LLPreview::find(new_item->getUUID());
+                                nc = (LLPreviewNotecard*)LLPreview::find(item_id);
                                 if(nc)
                                 {
                                         // *HACK: we have to delete the asset in the VFS so
@@ -480,28 +463,39 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
                                 }
                         }
                         break;
-                case LLInventoryType::IT_LSL:
+                case LLAssetType::AT_LSL_TEXT:
                         {
-                                LLLiveLSLEditor* preview = LLLiveLSLEditor::find(item_id, task_id);
-                                if (preview)
+                                if(mQueueId.notNull())
                                 {
-                                        // Bytecode save completed
-                                        if (content["compiled"])
+                                        LLFloaterCompileQueue* queue = 
+                                                (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
+                                        if(NULL != queue)
                                         {
-                                                preview->callbackLSLCompileSucceeded(
-                                                        task_id,
-                                                        item_id,
-                                                        mPostData["is_script_running"]);
+                                                queue->removeItemByItemID(item_id);
                                         }
-                                        else
+                                }
+                                else
+                                {
+                                        LLLiveLSLEditor* preview = LLLiveLSLEditor::find(item_id, task_id);
+                                        if (preview)
                                         {
-                                                preview->callbackLSLCompileFailed(content["errors"]);
+                                                // Bytecode save completed
+                                                if (content["compiled"])
+                                                {
+                                                        preview->callbackLSLCompileSucceeded(
+                                                                task_id,
+                                                                item_id,
+                                                                mPostData["is_script_running"]);
+                                                }
+                                                else
+                                                {
+                                                        preview->callbackLSLCompileFailed(content["errors"]);
+                                                }
                                         }
                                 }
                         }
                         break;
-                case LLInventoryType::IT_WEARABLE:
-                default:
-                        break;
+        default:
+                break;
         }
 }