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/llmoveview.cpp | |
parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) |
merge
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rw-r--r-- | indra/newview/llmoveview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 680f937e83..f0fd7e1b7c 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -703,7 +703,7 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view) LLPanelStandStopFlying* LLPanelStandStopFlying::getStandStopFlyingPanel() { LLPanelStandStopFlying* panel = new LLPanelStandStopFlying(); - buildPanel(panel, "panel_stand_stop_flying.xml"); + panel->buildFromFile("panel_stand_stop_flying.xml"); panel->setVisible(FALSE); //LLUI::getRootView()->addChild(panel); |