diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
| commit | e58c809a5816383674d0f1957440fad728e88893 (patch) | |
| tree | 83f1ff2c4bee8237c4557793143b2133623943a4 /indra/newview/llscriptfloater.h | |
| parent | f9af1f4fca028709b0262c0e8c40eefc2ab13d00 (diff) | |
| parent | e6c0615b97019cf9c8aee267513757c0c2510420 (diff) | |
merge changes for STORM-1131
Diffstat (limited to 'indra/newview/llscriptfloater.h')
| -rw-r--r-- | indra/newview/llscriptfloater.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h index da70bb4334..8e959a3d0e 100644 --- a/indra/newview/llscriptfloater.h +++ b/indra/newview/llscriptfloater.h @@ -28,8 +28,9 @@ #define LL_SCRIPTFLOATER_H #include "lltransientdockablefloater.h" +#include "llnotificationptr.h" -class LLToastNotifyPanel; +class LLToastPanel; /** * Handles script notifications ("ScriptDialog" and "ScriptDialogGroup") @@ -203,7 +204,9 @@ protected: void dockToChiclet(bool dock); private: - LLToastNotifyPanel* mScriptForm; + bool isScriptTextbox(LLNotificationPtr notification); + + LLToastPanel* mScriptForm; LLUUID mNotificationId; LLUUID mObjectId; bool mSaveFloaterPosition; |