diff options
| author | callum <none@none> | 2009-11-24 14:36:57 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-24 14:36:57 -0800 |
| commit | fd74ba5467967cbdb5f7aca8b476080c66df2cd2 (patch) | |
| tree | fac520db60d0b08aea8b803571a04c1a8037803d /indra/newview/llagent.cpp | |
| parent | b0a31eaaee10b92df9e5aa80ccfeb25c5e797ac1 (diff) | |
| parent | fa88f41cccb9aeb5ccfdafbf5da5b34b72be1108 (diff) | |
Merge to tip
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 4dd569e2fa..eb5d172ff7 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2795,7 +2795,8 @@ void LLAgent::endAnimationUpdateUI() LLBottomTray::getInstance()->setVisible(TRUE); - LLSideTray::getInstance()->setVisible(TRUE); + LLSideTray::getInstance()->getButtonsPanel()->setVisible(TRUE); + LLSideTray::getInstance()->updateSidetrayVisibility(); LLPanelStandStopFlying::getInstance()->setVisible(TRUE); @@ -2893,7 +2894,8 @@ void LLAgent::endAnimationUpdateUI() LLBottomTray::getInstance()->setVisible(FALSE); - LLSideTray::getInstance()->setVisible(FALSE); + LLSideTray::getInstance()->getButtonsPanel()->setVisible(FALSE); + LLSideTray::getInstance()->updateSidetrayVisibility(); LLPanelStandStopFlying::getInstance()->setVisible(FALSE); |