summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaternamedesc.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-04 09:32:38 -0500
committerOz Linden <oz@lindenlab.com>2012-01-04 09:32:38 -0500
commit97630acce0451c85f8fcc5bcd941e5d45867ad80 (patch)
tree21584b674340e83b0001f570de257c0f7026012c /indra/newview/llfloaternamedesc.h
parent1ce22e0a5dd62bc6a750fbdd39719190360af611 (diff)
parent032a5e45728597106e07d2d22de3799aaaaf4923 (diff)
merge changes for storm-1708
Diffstat (limited to 'indra/newview/llfloaternamedesc.h')
-rw-r--r--indra/newview/llfloaternamedesc.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfloaternamedesc.h b/indra/newview/llfloaternamedesc.h
index 7381a6334a..69bbccaf80 100644
--- a/indra/newview/llfloaternamedesc.h
+++ b/indra/newview/llfloaternamedesc.h
@@ -51,6 +51,7 @@ protected:
protected:
BOOL mIsAudio;
+ bool mIsText;
std::string mFilenameAndPath;
std::string mFilename;
@@ -62,5 +63,12 @@ public:
LLFloaterSoundPreview(const LLSD& filename );
virtual BOOL postBuild();
};
-
+
+class LLFloaterScriptPreview : public LLFloaterNameDesc
+{
+public:
+ LLFloaterScriptPreview(const LLSD& filename );
+ virtual BOOL postBuild();
+};
+
#endif // LL_LLFLOATERNAMEDESC_H