diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:38:21 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:38:21 +0000 |
commit | 35e5a5005e7ab85a640aee08137a96c42e4d55ea (patch) | |
tree | 77fc6fae473e0860b42c55b8bddcf8e3ed981074 /indra/newview/lltoastpanel.h | |
parent | 6631e4d872fd4bd0208e44320e0b189b624cda86 (diff) | |
parent | 82575515e0614552548bd3f45cea558772bb032f (diff) |
merge.
Diffstat (limited to 'indra/newview/lltoastpanel.h')
-rw-r--r-- | indra/newview/lltoastpanel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoastpanel.h b/indra/newview/lltoastpanel.h index a88127b008..f1dd7d7a86 100644 --- a/indra/newview/lltoastpanel.h +++ b/indra/newview/lltoastpanel.h @@ -35,7 +35,7 @@ #include "llpanel.h" #include "lltextbox.h" -#include "llnotifications.h" +#include "llnotificationptr.h" #include <string> @@ -57,7 +57,7 @@ public: virtual ~LLToastPanel() = 0; virtual std::string getTitle(); - virtual const LLUUID& getID() { return mNotification->id();} + virtual const LLUUID& getID(); static const S32 MIN_PANEL_HEIGHT; protected: |