1 files changed, 4 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 300cd79..6b0455e 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -416,7 +416,10 @@ void LLPanelPlace::onClickTeleport(void* data)
                 parent_floaterp->close();
         }
         // LLFloater* parent_floaterp = (LLFloater*)self->getParent();
-        parent_viewp->setVisible(false);
+        if (parent_viewp)
+        {
+                parent_viewp->setVisible(false);
+        }
         if(self->mLandmarkAssetID.notNull())
         {
                 gAgent.teleportViaLandmark(self->mLandmarkAssetID);