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/llstatusbar.cpp | |
parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) |
merge
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
-rw-r--r-- | indra/newview/llstatusbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 8d61bb94e1..63e54fdeb2 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -142,7 +142,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mBalanceTimer = new LLFrameTimer(); mHealthTimer = new LLFrameTimer(); - buildPanel(this,"panel_status_bar.xml"); + buildFromFile("panel_status_bar.xml"); } LLStatusBar::~LLStatusBar() |