diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:25:53 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:25:53 -0700 |
| commit | 2bf9acabfb534821e5302848860ef6a01af23b1b (patch) | |
| tree | 3fffdc39c3e7904ae0f9995529383a0ecff46b1b /indra/newview/llviewerwindow.cpp | |
| parent | 04d6bd302ba5809dc6aa1c33d91dc0737af6e033 (diff) | |
| parent | 492c93369ccc08dda1f1f51912737dec81d7de83 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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 b84db6b1c0..369e56878c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3174,7 +3174,7 @@ void LLViewerWindow::updateLayout() //gMenuBarView->setItemVisible("BuildTools", gFloaterTools->getVisible()); } - LLFloaterBuildOptions* build_options_floater = LLFloaterReg::getTypedInstance<LLFloaterBuildOptions>("build_options"); + LLFloaterBuildOptions* build_options_floater = LLFloaterReg::findTypedInstance<LLFloaterBuildOptions>("build_options"); if (build_options_floater && build_options_floater->getVisible()) { build_options_floater->updateGridMode(); |