diff options
| author | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
| commit | 83bb4b9518da813a42e49366cea15e5ae9dc7507 (patch) | |
| tree | 395372dc049dc2ea06dcd977a8b71befbda37fe0 /indra/llui/lllayoutstack.cpp | |
| parent | 1911993cc7761216c70b95e77b49da383c9e162d (diff) | |
fixed merge
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index a0275b6ed5..940c7e7e18 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -208,8 +208,8 @@ S32 LLLayoutStack::getDefaultWidth(S32 cur_width) void LLLayoutStack::movePanel(LLPanel* panel_to_move, LLPanel* target_panel, bool move_to_front) { - LayoutPanel* embedded_panel_to_move = findEmbeddedPanel(panel_to_move); - LayoutPanel* embedded_target_panel = move_to_front ? *mPanels.begin() : findEmbeddedPanel(target_panel); + LLLayoutPanel* embedded_panel_to_move = findEmbeddedPanel(panel_to_move); + LLLayoutPanel* embedded_target_panel = move_to_front ? *mPanels.begin() : findEmbeddedPanel(target_panel); if (!embedded_panel_to_move || !embedded_target_panel || embedded_panel_to_move == embedded_target_panel) { |