diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
commit | ee0055f5af672bef8402679fe8cc41717b0b9678 (patch) | |
tree | d2c025aa4d9469d98a0c8544e1634eedfbad0c84 /indra/newview/llscriptfloater.h | |
parent | ad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff) | |
parent | 73962e2134035855def0177db171d8eddaa193cb (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llscriptfloater.h')
-rw-r--r-- | indra/newview/llscriptfloater.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h index dc52baa115..8e959a3d0e 100644 --- a/indra/newview/llscriptfloater.h +++ b/indra/newview/llscriptfloater.h @@ -30,7 +30,7 @@ #include "lltransientdockablefloater.h" #include "llnotificationptr.h" -class LLToastNotifyPanel; +class LLToastPanel; /** * Handles script notifications ("ScriptDialog" and "ScriptDialogGroup") @@ -206,7 +206,7 @@ protected: private: bool isScriptTextbox(LLNotificationPtr notification); - LLToastNotifyPanel* mScriptForm; + LLToastPanel* mScriptForm; LLUUID mNotificationId; LLUUID mObjectId; bool mSaveFloaterPosition; |