diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-22 23:22:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-22 23:22:09 -0700 |
| commit | 244734647c38f256ace2d64fde4d3149d37e0e25 (patch) | |
| tree | 546632cef0b87ec329966adfe03e568b49877a21 /indra/newview/llviewerwindow.cpp | |
| parent | 022dd124604c8a0a3d83b481d03a687556fcf2c4 (diff) | |
| parent | 6ad4822a05fa2d0cb0a9ab616384b374dc877883 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index be508ad17d..45ff75bb34 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1798,6 +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 |