diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
| commit | c7ebeb842010c4a814978f63c464e1546bd6a9be (patch) | |
| tree | de77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/newview/llpreviewscript.h | |
| parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) | |
| parent | 4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff) | |
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llpreviewscript.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index 5f65be7383..71ca3e31b1 100755..100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -206,9 +206,6 @@ protected: void uploadAssetViaCaps(const std::string& url, const std::string& filename, const LLUUID& item_id); - void uploadAssetLegacy(const std::string& filename, - const LLUUID& item_id, - const LLTransactionID& tid); static void onSearchReplace(void* userdata); static void onLoad(void* userdata); @@ -276,10 +273,6 @@ private: const LLUUID& item_id, BOOL is_running, const LLUUID& experience_public_id); - void uploadAssetLegacy(const std::string& filename, - LLViewerObject* object, - const LLTransactionID& tid, - BOOL is_running); BOOL monoChecked() const; |