diff options
author | callum <none@none> | 2010-12-22 15:22:43 -0800 |
---|---|---|
committer | callum <none@none> | 2010-12-22 15:22:43 -0800 |
commit | fa776d805437a89bcd322513ce43e702853f5f1b (patch) | |
tree | d20fbea8008160e03cc1cfc0970a8d314098d5e2 /indra/newview/llscriptfloater.h | |
parent | 064bdb00908f7b36e5ce65db28c7bd0ee9c9c0eb (diff) | |
parent | c86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff) |
Merge with tip of 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; |