diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:58 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:58 +0300 |
| commit | 3e85f6a8c9d34c64ab19af03015efcd8d4c93f80 (patch) | |
| tree | 42deaa6134afb3e4b9bcb3f7ec26aa2633026f5d /indra/newview/llmediactrl.h | |
| parent | e7563ff13fe1e6e77a0c6de5dcf0c1b67a6d2e2c (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-540-maint
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 958c76f261..bd24c47a4f 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -31,6 +31,7 @@ #include "lluictrl.h" #include "llframetimer.h" +#include "llnotificationptr.h" class LLViewBorder; class LLUICtrlFactory; @@ -145,7 +146,7 @@ public: void setTextureSize(S32 width, S32 height); - void showNotification(boost::shared_ptr<class LLNotification> notify); + void showNotification(LLNotificationPtr notify); void hideNotification(); void setTrustedContent(bool trusted); |