diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-04 12:17:07 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-04 12:17:07 -0700 |
| commit | 48d98b493038240b639775a93b33e4f9357e408f (patch) | |
| tree | d44fd428e6e67536077980907b3f9743bd9ccc00 /indra/newview/llviewerwindow.cpp | |
| parent | e09959df0d51eb8f4d37719d2753d2016390b25b (diff) | |
| parent | dabce05d1eed47944e39438e50b3c788b7df649d (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 4afd90b44c..be508ad17d 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1798,9 +1798,7 @@ void LLViewerWindow::initBase() // Constrain floaters to inside the menu and status bar regions. gFloaterView = main_view->getChild<LLFloaterView>("Floater View"); - gFloaterView->setFloaterSnapView(main_view->getChild<LLView>("floater_snap_region")->getHandle()); gSnapshotFloaterView = main_view->getChild<LLSnapshotFloaterView>("Snapshot Floater View"); - // Console llassert( !gConsole ); |