diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:57:54 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:57:54 -0700 |
| commit | c50f44e04ed4c14dd19b18421878cc0094cee9b2 (patch) | |
| tree | bd7418ba39e5aeac26c31df3b5dd7d4e4b676e73 /indra/newview/llviewerwindow.cpp | |
| parent | bf55d287db305907b83909c09bc5842a5a7a709f (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge viewer-release 3.6.5
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 87ae224655..40b8560071 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1813,7 +1813,6 @@ void LLViewerWindow::initBase() 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 ); |