diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-08 15:15:27 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-08 15:15:27 -0800 |
| commit | 5aa5a77af66425dd90599b0b0cad5b8f58d7669a (patch) | |
| tree | b99f072b9bb8f124ca11843569adaa7104407d81 | |
| parent | a312498260c05cedd6fc6ecb60f5f74d6b72be46 (diff) | |
CHUI-516: Correcting crash when receiving a god-like teleport lure request while in do-not-disturb mode.
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d500fd78ff..1ddfc51f27 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2033,11 +2033,14 @@ bool lure_callback(const LLSD& notification, const LLSD& response) LLNotificationPtr notification_ptr = LLNotifications::instance().find(notification["id"].asUUID()); - LLNotificationFormPtr modified_form(new LLNotificationForm(*notification_ptr->getForm())); - modified_form->setElementEnabled("Teleport", false); - modified_form->setElementEnabled("Cancel", false); - notification_ptr->updateForm(modified_form); - notification_ptr->repost(); + if (notification_ptr) + { + LLNotificationFormPtr modified_form(new LLNotificationForm(*notification_ptr->getForm())); + modified_form->setElementEnabled("Teleport", false); + modified_form->setElementEnabled("Cancel", false); + notification_ptr->updateForm(modified_form); + notification_ptr->repost(); + } return false; } |