diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-07 15:58:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-07 15:58:20 -0700 |
| commit | c8cd7ef7a4da4482b776c37201b158a443dd737a (patch) | |
| tree | 521c6dc7af632dc9df64a69c18997eb091d68f20 /indra/newview/llpanellandmarks.cpp | |
| parent | d1ad7a56beee603b336600d4aace1e4d4c0f5ade (diff) | |
| parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) | |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index b09360a2d6..c4a484d368 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -1245,7 +1245,12 @@ void LLLandmarksPanel::doProcessParcelInfo(LLLandmark* landmark, landmark->getGlobalPos(landmark_global_pos); // let's toggle pick panel into panel places - LLPanel* panel_places = LLSideTray::getInstance()->getChild<LLPanel>("panel_places");//-> sidebar_places + LLPanel* panel_places = LLSideTray::getInstance()->getPanel("panel_places");//-> sidebar_places + if (!panel_places) + { + llassert(NULL != panel_places); + return; + } panel_places->addChild(panel_pick); LLRect paren_rect(panel_places->getRect()); panel_pick->reshape(paren_rect.getWidth(),paren_rect.getHeight(), TRUE); |