diff options
author | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
commit | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch) | |
tree | 767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/newview/llviewerwindow.cpp | |
parent | 21ab67416d471a90b343052c986478c9dd65ae79 (diff) | |
parent | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (diff) |
merge
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 ee4972e13b..34b0f450ab 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 ); |