diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:29:08 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:29:08 -0800 |
commit | 0627d550f371c26b00e802bae288a5e6def53345 (patch) | |
tree | 8f4e740736d4fbca2eb543bb0148232e968286ef /indra/newview/llpreviewscript.h | |
parent | 9e53ad6111ce0e15cb10f2ffb47fee8b48d1c3db (diff) | |
parent | 51e640e5d753ac9dc005cd6827db77988a04b8fa (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/
Diffstat (limited to 'indra/newview/llpreviewscript.h')
-rw-r--r-- | indra/newview/llpreviewscript.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index a00f580e32..28a409d3ee 100644 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -41,7 +41,6 @@ #include "lliconctrl.h" #include "llframetimer.h" - class LLMessageSystem; class LLTextEditor; class LLButton; @@ -52,6 +51,7 @@ struct LLEntryAndEdCore; class LLMenuBarGL; class LLFloaterScriptSearch; class LLKeywordToken; +class LLViewerInventoryItem; // Inner, implementation class. LLPreviewScript and LLLiveLSLEditor each own one of these. class LLScriptEdCore : public LLPanel |