diff options
| -rwxr-xr-x | indra/newview/llfloaternamedesc.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewerassetupload.h | 5 | ||||
| -rwxr-xr-x | indra/newview/llviewermenufile.cpp | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index 46dbf85dfa..135bbb335e 100755 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -164,7 +164,7 @@ void LLFloaterNameDesc::onBtnOK( ) void *nruserdata = NULL; std::string display_name = LLStringUtil::null; - LLResourceUploadInfo::ptr_t uploadInfo(new NewFileResourceUploadInfo( + LLResourceUploadInfo::ptr_t uploadInfo(new LLNewFileResourceUploadInfo( mFilenameAndPath, getChild<LLUICtrl>("name_form")->getValue().asString(), getChild<LLUICtrl>("description_form")->getValue().asString(), 0, diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index 9982d68f52..51374922e8 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -286,7 +286,7 @@ std::string LLResourceUploadInfo::getDisplayName() const }; //========================================================================= -NewFileResourceUploadInfo::NewFileResourceUploadInfo( +LLNewFileResourceUploadInfo::LLNewFileResourceUploadInfo( std::string fileName, std::string name, std::string description, @@ -306,7 +306,7 @@ NewFileResourceUploadInfo::NewFileResourceUploadInfo( -LLSD NewFileResourceUploadInfo::prepareUpload() +LLSD LLNewFileResourceUploadInfo::prepareUpload() { if (getAssetId().isNull()) generateNewAssetId(); @@ -318,7 +318,7 @@ LLSD NewFileResourceUploadInfo::prepareUpload() return LLResourceUploadInfo::prepareUpload(); } -LLSD NewFileResourceUploadInfo::exportTempFile() +LLSD LLNewFileResourceUploadInfo::exportTempFile() { std::string filename = gDirUtilp->getTempFilename(); diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h index 23013ac664..604db808b1 100644 --- a/indra/newview/llviewerassetupload.h +++ b/indra/newview/llviewerassetupload.h @@ -126,10 +126,10 @@ private: }; //------------------------------------------------------------------------- -class NewFileResourceUploadInfo : public LLResourceUploadInfo +class LLNewFileResourceUploadInfo : public LLResourceUploadInfo { public: - NewFileResourceUploadInfo( + LLNewFileResourceUploadInfo( std::string fileName, std::string name, std::string description, @@ -207,7 +207,6 @@ public: bool getIsRunning() const { return mIsRunning; } private: - bool mSaveToVFS; LLUUID mExerienceId; TargetType_t mTargetType; bool mIsRunning; diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 163ae4f4ec..904fa7fcbe 100755 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -436,7 +436,7 @@ class LLFileUploadBulk : public view_listener_t LLStringUtil::stripNonprintable(asset_name); LLStringUtil::trim(asset_name); - LLResourceUploadInfo::ptr_t uploadInfo(new NewFileResourceUploadInfo( + LLResourceUploadInfo::ptr_t uploadInfo(new LLNewFileResourceUploadInfo( filename, asset_name, asset_name, 0, @@ -635,7 +635,7 @@ LLUUID upload_new_resource( void *userdata) { - LLResourceUploadInfo::ptr_t uploadInfo(new NewFileResourceUploadInfo( + LLResourceUploadInfo::ptr_t uploadInfo(new LLNewFileResourceUploadInfo( src_filename, name, desc, compression_info, destination_folder_type, inv_type, |