diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
| commit | 34c12d009c232917732e6eeb452da7e76b2ee12e (patch) | |
| tree | 847155313ac7588a23f3ee71d3ee8f3ab30580c9 /indra/newview/llmoveview.cpp | |
| parent | 7b9817cbcc5acab58d9d4355984b429850bd3ef8 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rwxr-xr-x | indra/newview/llmoveview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 32b168b8c5..8bddf49fb5 100755 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -698,14 +698,14 @@ void LLPanelStandStopFlying::updatePosition() S32 y_pos = 0; S32 bottom_tb_center = 0; - if (LLToolBar* toolbar_bottom = gToolBarView->getToolbar(LLToolBarView::TOOLBAR_BOTTOM)) + if (LLToolBar* toolbar_bottom = gToolBarView->getToolbar(LLToolBarEnums::TOOLBAR_BOTTOM)) { y_pos = toolbar_bottom->getRect().getHeight(); bottom_tb_center = toolbar_bottom->getRect().getCenterX(); } S32 left_tb_width = 0; - if (LLToolBar* toolbar_left = gToolBarView->getToolbar(LLToolBarView::TOOLBAR_LEFT)) + if (LLToolBar* toolbar_left = gToolBarView->getToolbar(LLToolBarEnums::TOOLBAR_LEFT)) { left_tb_width = toolbar_left->getRect().getWidth(); } |