diff options
| author | McCabe Maxsted | 2010-06-21 05:38:13 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-26 18:55:34 -0500 |
| commit | fda39084e2baff093d6b520c3ab30375e734bb3c (patch) | |
| tree | e232e716ec4d5d84ac6ccc99a2d2028cd7e8f2ed /linden | |
| parent | Added menu entries to take off alpha and tattoo layers. (diff) | |
| download | meta-impy-fda39084e2baff093d6b520c3ab30375e734bb3c.zip meta-impy-fda39084e2baff093d6b520c3ab30375e734bb3c.tar.gz meta-impy-fda39084e2baff093d6b520c3ab30375e734bb3c.tar.bz2 meta-impy-fda39084e2baff093d6b520c3ab30375e734bb3c.tar.xz | |
Fixed #357: Crash in LLPanelPlace::onClickTeleport
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llpanelplace.cpp | 5 |
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) | |||
| 416 | parent_floaterp->close(); | 416 | parent_floaterp->close(); |
| 417 | } | 417 | } |
| 418 | // LLFloater* parent_floaterp = (LLFloater*)self->getParent(); | 418 | // LLFloater* parent_floaterp = (LLFloater*)self->getParent(); |
| 419 | parent_viewp->setVisible(false); | 419 | if (parent_viewp) |
| 420 | { | ||
| 421 | parent_viewp->setVisible(false); | ||
| 422 | } | ||
| 420 | if(self->mLandmarkAssetID.notNull()) | 423 | if(self->mLandmarkAssetID.notNull()) |
| 421 | { | 424 | { |
| 422 | gAgent.teleportViaLandmark(self->mLandmarkAssetID); | 425 | gAgent.teleportViaLandmark(self->mLandmarkAssetID); |