diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-20 00:57:39 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-20 00:58:09 +0300 |
| commit | b8d846f0eda7edc45fda3c311f0f5864801ed0f5 (patch) | |
| tree | a8a1c8b5c5b0117dbff0ed187a72e7c8599745bb /indra/newview/llmediactrl.h | |
| parent | a5675bedbb2bd34ce03dd16651dc74d8078efea9 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
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); |