diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-29 12:26:30 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-29 12:26:30 +0100 |
| commit | 610236174baaa2f85d57e7ddd941831e1b3e4ac8 (patch) | |
| tree | f20fe8bd944d759bfad7b6fd39f47376cfd2560e /indra/newview/llpanellandmarks.cpp | |
| parent | 7007896f9811022c58fab6e7e320dfb6773b1a71 (diff) | |
| parent | 443cf1f72e443c62c0ed92e629b040bb50dd7b58 (diff) | |
merge
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); |