diff options
| author | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
| commit | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (patch) | |
| tree | c32d7e9b29e37d5c30ac16dfac55733456d7eee0 /indra/newview/lleventnotifier.cpp | |
| parent | 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c (diff) | |
| parent | a8d216e194327c7bee8a42c983f7f2ca01adb385 (diff) | |
Merge of my DEV-36732 work and all the main line login api work that went on.
Diffstat (limited to 'indra/newview/lleventnotifier.cpp')
| -rw-r--r-- | indra/newview/lleventnotifier.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp index e54d78de2e..80d4d21166 100644 --- a/indra/newview/lleventnotifier.cpp +++ b/indra/newview/lleventnotifier.cpp @@ -190,9 +190,12 @@ bool LLEventNotification::handleResponse(const LLSD& notification, const LLSD& r switch (option) { case 0: - gAgent.teleportViaLocation(getEventPosGlobal()); - LLFloaterWorldMap::getInstance()->trackLocation(getEventPosGlobal()); - break; + { + gAgent.teleportViaLocation(getEventPosGlobal()); + LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance(); + if(floater_world_map) floater_world_map->trackLocation(getEventPosGlobal()); + break; + } case 1: gDisplayEventHack = TRUE; LLFloaterReg::showInstance("search", LLSD().insert("panel", "event").insert("id", S32(getEventID()))); |