summaryrefslogtreecommitdiff
path: root/indra/newview/llscriptfloater.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-19 17:03:05 -0500
committerOz Linden <oz@lindenlab.com>2010-11-19 17:03:05 -0500
commit3337ef16cee97e26b45aa07518d34d031bdc75fa (patch)
treeb3302fdbae8802ac4d209c960a5b9629938182f2 /indra/newview/llscriptfloater.h
parent2eec4949cc49f3c59cdc278be0e7eed1e092b167 (diff)
parentf6ba55b8ed24246be340d069c64d25bd614194a6 (diff)
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/llscriptfloater.h')
-rw-r--r--indra/newview/llscriptfloater.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index da70bb4334..dc52baa115 100644
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -28,6 +28,7 @@
#define LL_SCRIPTFLOATER_H
#include "lltransientdockablefloater.h"
+#include "llnotificationptr.h"
class LLToastNotifyPanel;
@@ -203,6 +204,8 @@ protected:
void dockToChiclet(bool dock);
private:
+ bool isScriptTextbox(LLNotificationPtr notification);
+
LLToastNotifyPanel* mScriptForm;
LLUUID mNotificationId;
LLUUID mObjectId;