diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:04:37 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:04:37 +0000 |
| commit | 9fdd1582774a928242b7fec91bbd951b123296e8 (patch) | |
| tree | 600cd078a00e80a33504c748540e333a34a4b30d /indra/newview/llpreviewscript.h | |
| parent | 31bca613a6011f5e1a95cffafd283e445142557f (diff) | |
| parent | 363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (diff) | |
Merged in DV525-merge-6.4.15 (pull request #483)
DRTVWR-525 merge up to 6.4.15
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r-- | indra/newview/llpreviewscript.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index 3cf22a0e6e..18c10ab365 100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -48,7 +48,6 @@ struct LLEntryAndEdCore; class LLMenuBarGL; class LLFloaterScriptSearch; class LLKeywordToken; -class LLVFS; class LLViewerInventoryItem; class LLScriptEdContainer; class LLFloaterGotoLine; @@ -143,6 +142,9 @@ public: void setItemRemoved(bool script_removed){mScriptRemoved = script_removed;}; + void setAssetID( const LLUUID& asset_id){ mAssetID = asset_id; }; + LLUUID getAssetID() { return mAssetID; } + private: void onBtnDynamicHelp(); void onBtnUndoChanges(); @@ -188,6 +190,7 @@ private: LLUUID mAssociatedExperience; BOOL mScriptRemoved; BOOL mSaveDialogShown; + LLUUID mAssetID; LLScriptEdContainer* mContainer; // parent view @@ -234,7 +237,7 @@ protected: static void onLoad(void* userdata); static void onSave(void* userdata, BOOL close_after_save); - static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid, + static void onLoadComplete(const LLUUID& uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); @@ -295,13 +298,13 @@ private: static void onLoad(void* userdata); static void onSave(void* userdata, BOOL close_after_save); - static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid, + static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); static void onRunningCheckboxClicked(LLUICtrl*, void* userdata); static void onReset(void* userdata); - void loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type); + void loadScriptText(const LLUUID &uuid, LLAssetType::EType type); static void onErrorList(LLUICtrl*, void* user_data); |