diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llpreviewscript.h | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r-- | indra/newview/llpreviewscript.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index 54b27316f7..444bb629e6 100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -47,6 +47,7 @@ public: const LLViewHandle& floater_handle, void (*load_callback)(void* userdata), void (*save_callback)(void* userdata, BOOL close_after_save), + void (*search_replace_callback)(void* userdata), void* userdata, S32 bottom_pad = 0); // pad below bottom row of buttons ~LLScriptEdCore(); @@ -110,6 +111,7 @@ private: LLTextEditor* mEditor; void (*mLoadCallback)(void* userdata); void (*mSaveCallback)(void* userdata, BOOL close_after_save); + void (*mSearchReplaceCallback) (void* userdata); void* mUserdata; LLComboBox *mFunctions; BOOL mForceClose; @@ -149,14 +151,15 @@ protected: 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); static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, - void* user_data, S32 status); - static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status); - static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status); + 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); static LLPreviewLSL* getInstance(const LLUUID& uuid); static void* createScriptEdPanel(void* userdata); @@ -209,14 +212,15 @@ protected: const LLTransactionID& tid, BOOL is_running); + static void onSearchReplace(void* userdata); static void onLoad(void* userdata); static void onSave(void* userdata, BOOL close_after_save); static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type, - void* user_data, S32 status); - static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status); - static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status); + 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); |