diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-02-07 13:41:41 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-02-07 13:41:41 -0800 |
| commit | 867ef882fdf43dffd678722a8fdd77b618d13acf (patch) | |
| tree | d234b0f6e549539638e098c3bd84a469070116f8 /indra/newview/llpreviewscript.h | |
| parent | f3b1efae5d27d5597d3dc9468bce93679cae85e8 (diff) | |
| parent | cc235cdcc41fb1846b878769f5d4097ff9ad3b4d (diff) | |
merge changes for OPEN-292
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r-- | 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 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; |