diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
| commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
| tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/llpanelplaces.cpp | |
| parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index d18cac9f42..42b09a45c3 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -108,13 +108,14 @@ void LLPanelPlaces::onOpen(const LLSD& key) return; togglePlaceInfoPanel(TRUE); - + mPlaceInfoType = key["type"].asInteger(); if (mPlaceInfoType == AGENT) { // We don't need to teleport to the current location so disable the button getChild<LLButton>("teleport_btn")->setEnabled(FALSE); + getChild<LLButton>("map_btn")->setEnabled(TRUE); mPlaceInfo->displayParcelInfo(gAgent.getPositionAgent(), gAgent.getRegion()->getRegionID(), @@ -178,15 +179,11 @@ void LLPanelPlaces::onSearchEdit(const std::string& search_string) void LLPanelPlaces::onTabSelected() { - if (!mActivePanel) - return; - mActivePanel = dynamic_cast<LLPanelPlacesTab*>(mTabContainer->getCurrentPanel()); - if (mActivePanel) { mActivePanel->onSearchEdit(mFilterSubString); - mActivePanel->onTabSelected(); + mActivePanel->updateVerbs(); } } @@ -249,7 +246,7 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible) LLRect rect = getRect(); LLRect new_rect = LLRect(rect.mLeft, rect.mTop, rect.mRight, mTabContainer->getRect().mBottom); - mPlaceInfo->reshape(new_rect.getWidth(),new_rect.getHeight()); + mPlaceInfo->reshape(new_rect.getWidth(),new_rect.getHeight()); } } |