diff options
| author | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
| commit | 6bbd490107abe162c114ccd990636ae6b16f46f8 (patch) | |
| tree | 13d7f4c1da1f28fe7ed8b73bcea82cea35ba9526 /indra/newview/llviewerwindow.cpp | |
| parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
| parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index c5dee710cb..ac45daf810 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1521,7 +1521,7 @@ void LLViewerWindow::initBase() // (But wait to add it as a child of the root view so that it will be in front of the // other views.) MainPanel* main_view = new MainPanel(); - LLPanel::buildPanel(main_view, "main_view.xml"); + main_view->buildFromFile("main_view.xml"); main_view->setShape(full_window); getRootView()->addChild(main_view); |