diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llpreviewscript.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r-- | indra/newview/llpreviewscript.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index d7d96e2037..aec4bb2ab7 100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -121,16 +121,16 @@ public: protected: void deleteBridges(); - void setHelpPage(const LLString& help_string); + void setHelpPage(const std::string& help_string); void updateDynamicHelp(BOOL immediate = FALSE); - void addHelpItemToHistory(const LLString& help_string); + void addHelpItemToHistory(const std::string& help_string); static void onErrorList(LLUICtrl*, void* user_data); virtual const char *getTitleName() const { return "Script"; } private: - LLString mSampleText; + std::string mSampleText; std::string mHelpFile; LLTextEditor* mEditor; void (*mLoadCallback)(void* userdata); @@ -253,7 +253,7 @@ protected: static void onRunningCheckboxClicked(LLUICtrl*, void* userdata); static void onReset(void* userdata); - void loadScriptText(const char* filename); +// void loadScriptText(const std::string& filename); // unused void loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type); static void onErrorList(LLUICtrl*, void* user_data); @@ -279,7 +279,4 @@ protected: static LLMap<LLUUID, LLLiveLSLEditor*> sInstances; }; -// name of help file for lsl -extern const char HELP_LSL[]; - #endif // LL_LLPREVIEWSCRIPT_H |