diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-13 14:43:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-13 14:43:12 -0400 |
| commit | 3f7c999c30e2a72528a156f7dacdb06f1f1d173f (patch) | |
| tree | 0cdbf3007ef4e90aa6f5ed795fb1bbad283d848a /indra/newview/llpreviewscript.h | |
| parent | 57488bc3812d9d308cc9e869c2088ba8212bc851 (diff) | |
| parent | 77ef10e0493a192a1e7f1cb988bac757bd199f69 (diff) | |
merge changes for OPEN-292
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r-- | indra/newview/llpreviewscript.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index fc2a56c0a4..a8c6a6eeeb 100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -204,10 +204,6 @@ protected: virtual void loadAsset(); /*virtual*/ void saveIfNeeded(bool sync = true); - void uploadAssetLegacy(const std::string& filename, - const LLUUID& item_id, - const LLTransactionID& tid); - static void onSearchReplace(void* userdata); static void onLoad(void* userdata); static void onSave(void* userdata, BOOL close_after_save); @@ -215,9 +211,7 @@ protected: static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); - static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status); - static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status); - + protected: static void* createScriptEdPanel(void* userdata); @@ -268,10 +262,6 @@ private: virtual void loadAsset(); void loadAsset(BOOL is_new); /*virtual*/ void saveIfNeeded(bool sync = true); - void uploadAssetLegacy(const std::string& filename, - LLViewerObject* object, - const LLTransactionID& tid, - BOOL is_running); BOOL monoChecked() const; @@ -282,8 +272,6 @@ private: static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); - static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status); - static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status); static void onRunningCheckboxClicked(LLUICtrl*, void* userdata); static void onReset(void* userdata); |