diff options
| author | James Cook <james@lindenlab.com> | 2008-10-28 23:56:20 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-10-28 23:56:20 +0000 |
| commit | b406972af1ce404b19639cdbe955f07d2f8fb61f (patch) | |
| tree | 7bc82814b795f608b341a4402b0390fe285bee5f /indra/newview/llpreviewscript.h | |
| parent | 7a9360c8bc5b5819aec805cf1583fa7c84ea02ea (diff) | |
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating:
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rw-r--r-- | indra/newview/llpreviewscript.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index ca1c527cb2..c0af06f480 100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -65,7 +65,7 @@ public: const std::string& name, const LLRect& rect, const std::string& sample, - const std::string& help, + const std::string& help_url, const LLHandle<LLFloater>& floater_handle, void (*load_callback)(void* userdata), void (*save_callback)(void* userdata, BOOL close_after_save), @@ -132,7 +132,7 @@ protected: private: std::string mSampleText; - std::string mHelpFile; + std::string mHelpURL; LLTextEditor* mEditor; void (*mLoadCallback)(void* userdata); void (*mSaveCallback)(void* userdata, BOOL close_after_save); |