diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-05-10 18:05:23 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-05-10 18:05:23 +0300 |
| commit | b601b92e1fb8de7e82b0729b3b70342afde6f3d6 (patch) | |
| tree | 023cc38adef20bd59bb6d9a1b38544c278172d75 /indra/newview | |
| parent | b1243c55e5579f72e3dd9dafe2b53173349a047f (diff) | |
build fix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsnapshotlivepreview.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewerfloaterreg.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp index 88eb64f130..15aa62f5d3 100644 --- a/indra/newview/llsnapshotlivepreview.cpp +++ b/indra/newview/llsnapshotlivepreview.cpp @@ -1039,7 +1039,7 @@ void LLSnapshotLivePreview::saveTexture(BOOL outfit_snapshot, std::string name) LLInventoryType::EType inv_type = outfit_snapshot ? LLInventoryType::IT_NONE : LLInventoryType::IT_SNAPSHOT; LLResourceUploadInfo::ptr_t assetUploadInfo(new LLResourceUploadInfo( - tid, LLAssetType::AT_TEXTURE, name, desc, 0, + tid, LLAssetType::AT_TEXTURE, res_name, res_desc, 0, folder_type, inv_type, PERM_ALL, LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"), expected_upload_cost)); diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index c5ae0fecaa..5b6a23c785 100755 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -92,6 +92,7 @@ #include "llfloaternotificationstabbed.h" #include "llfloaterobjectweights.h" #include "llfloateropenobject.h" +#include "llfloateroutfitsnapshot.h" #include "llfloaterpathfindingcharacters.h" #include "llfloaterpathfindingconsole.h" #include "llfloaterpathfindinglinksets.h" |