diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-08 18:59:58 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-08 18:59:58 -0700 |
| commit | 21d7c1d0ba7fa548e5ea88010bb72e47656a53f5 (patch) | |
| tree | 83e2cc97b9a7967f221c353d726dd0077cb1fa5e /indra/newview/llviewerwindow.cpp | |
| parent | d533a33f4229244405ed0b247fce410513b6c3e9 (diff) | |
| parent | 48d98b493038240b639775a93b33e4f9357e408f (diff) | |
Pull merge
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 ); |