diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-11-12 15:47:04 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-11-12 15:47:04 +0000 |
| commit | 6e76e20faaa71caa10fdea8148735bd11141ebe1 (patch) | |
| tree | c174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llviewerparcelaskplay.cpp | |
| parent | f9a09406b38ad62e1db5914a96e462002c80fce9 (diff) | |
| parent | 21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (diff) | |
Merged in DV510-merge-6.4.12 (pull request #372)
DRTVWR-510 merge in 6.4.12
Diffstat (limited to 'indra/newview/llviewerparcelaskplay.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelaskplay.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelaskplay.cpp b/indra/newview/llviewerparcelaskplay.cpp index 74586dadc3..afbe2c94de 100644 --- a/indra/newview/llviewerparcelaskplay.cpp +++ b/indra/newview/llviewerparcelaskplay.cpp @@ -59,7 +59,10 @@ void LLViewerParcelAskPlay::initSingleton() } void LLViewerParcelAskPlay::cleanupSingleton() { - cancelNotification(); + if (LLNotifications::instanceExists()) + { + cancelNotification(); + } } void LLViewerParcelAskPlay::askToPlay(const LLUUID ®ion_id, const S32 &parcel_id, const std::string &url, ask_callback cb) |