summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneltopinfobar.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-05-07 15:28:13 -0700
committersimon <none@none>2014-05-07 15:28:13 -0700
commita5568f942b449e48cad71e92acd67eaa22dd5e5d (patch)
treef266b99c9663fda8001cbde48aa5a6b1b9d7db68 /indra/newview/llpaneltopinfobar.cpp
parent80a134ffcc68b277c10cc79dc9c7ca073148b41e (diff)
parentdc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff)
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/llpaneltopinfobar.cpp')
-rwxr-xr-xindra/newview/llpaneltopinfobar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpaneltopinfobar.cpp b/indra/newview/llpaneltopinfobar.cpp
index 0d09f0bbfc..109013498e 100755
--- a/indra/newview/llpaneltopinfobar.cpp
+++ b/indra/newview/llpaneltopinfobar.cpp
@@ -169,7 +169,7 @@ BOOL LLPanelTopInfoBar::postBuild()
mParcelMgrConnection = gAgent.addParcelChangedCallback(
boost::bind(&LLPanelTopInfoBar::onAgentParcelChange, this));
- setVisibleCallback(boost::bind(&LLPanelTopInfoBar::onVisibilityChange, this, _2));
+ setVisibleCallback(boost::bind(&LLPanelTopInfoBar::onVisibilityChanged, this, _2));
return TRUE;
}
@@ -186,7 +186,7 @@ void LLPanelTopInfoBar::onNavBarShowParcelPropertiesCtrlChanged()
// when panel is shown, all minimized floaters should be shifted downwards to prevent overlapping of
// PanelTopInfoBar. See EXT-7951.
-void LLPanelTopInfoBar::onVisibilityChange(const LLSD& show)
+void LLPanelTopInfoBar::onVisibilityChanged(const LLSD& show)
{
// this height is used as a vertical offset for ALREADY MINIMIZED floaters
// when PanelTopInfoBar visibility changes