diff options
| author | Armin Weatherwax | 2010-07-12 11:49:29 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2010-07-15 02:09:23 -0700 |
| commit | b3b6bc9fcd0bb94528327daef414a6dd7f578c01 (patch) | |
| tree | 607a1b0237273aeca5dd5b261f65627e469de082 /linden | |
| parent | Changed version to Weekly: 2010-07-10 (diff) | |
| download | meta-impy-b3b6bc9fcd0bb94528327daef414a6dd7f578c01.zip meta-impy-b3b6bc9fcd0bb94528327daef414a6dd7f578c01.tar.gz meta-impy-b3b6bc9fcd0bb94528327daef414a6dd7f578c01.tar.bz2 meta-impy-b3b6bc9fcd0bb94528327daef414a6dd7f578c01.tar.xz | |
fix bug #283: LM-floater crashes after logout/login on clicking teleport
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llpanelplace.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp index 6b0455e..d7939b9 100644 --- a/linden/indra/newview/llpanelplace.cpp +++ b/linden/indra/newview/llpanelplace.cpp | |||
| @@ -415,11 +415,7 @@ void LLPanelPlace::onClickTeleport(void* data) | |||
| 415 | { | 415 | { |
| 416 | parent_floaterp->close(); | 416 | parent_floaterp->close(); |
| 417 | } | 417 | } |
| 418 | // LLFloater* parent_floaterp = (LLFloater*)self->getParent(); | 418 | |
| 419 | if (parent_viewp) | ||
| 420 | { | ||
| 421 | parent_viewp->setVisible(false); | ||
| 422 | } | ||
| 423 | if(self->mLandmarkAssetID.notNull()) | 419 | if(self->mLandmarkAssetID.notNull()) |
| 424 | { | 420 | { |
| 425 | gAgent.teleportViaLandmark(self->mLandmarkAssetID); | 421 | gAgent.teleportViaLandmark(self->mLandmarkAssetID); |