diff options
| author | Richard Nelson <none@none> | 2010-09-27 09:46:20 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-09-27 09:46:20 -0700 |
| commit | ad440a68bb6a481f17ea8b0cb8f3cecf37502d51 (patch) | |
| tree | b41c81b55f73b6ebd4ee0a14dd195c07d7ce2d40 /indra/newview/llviewerwindow.cpp | |
| parent | b25d969b61eb1e4f114ee0e632d1de9777780e9f (diff) | |
| parent | 57b8571a8acd559b7a92c2d5ffbfe96b0c4b5b98 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index b2ff39bbd2..fb43b51deb 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1524,7 +1524,7 @@ void LLViewerWindow::initBase() mWorldViewPlaceholder = main_view->getChildView("world_view_rect")->getHandle(); mNonSideTrayView = main_view->getChildView("non_side_tray_view")->getHandle(); mFloaterViewHolder = main_view->getChildView("floater_view_holder")->getHandle(); - mPopupView = main_view->findChild<LLPopupView>("popup_holder"); + mPopupView = main_view->getChild<LLPopupView>("popup_holder"); mHintHolder = main_view->getChild<LLView>("hint_holder")->getHandle(); // Constrain floaters to inside the menu and status bar regions. |