diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-26 17:46:17 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-26 17:46:17 +0200 |
| commit | 81fdca151fa38494992115bfea219c7f9c6baf1e (patch) | |
| tree | 2ddc11a57ccdba3be2798456c62ea6f3a42c02fe /indra/llui/llbutton.cpp | |
| parent | 8a812495daa52aa9ae092222c23c5f8815929544 (diff) | |
| parent | 82575515e0614552548bd3f45cea558772bb032f (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 8930e32055..b91c614424 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -48,7 +48,7 @@ #include "llfloaterreg.h" #include "llfocusmgr.h" #include "llwindow.h" -#include "llnotifications.h" +#include "llnotificationsutil.h" #include "llrender.h" #include "lluictrlfactory.h" #include "llhelp.h" @@ -1106,7 +1106,7 @@ void LLButton::showHelp(LLUICtrl* ctrl, const LLSD& sdname) // display an error if we can't find a help_topic string. // fix this by adding a help_topic attribute to the xui file - LLNotifications::instance().add("UnableToFindHelpTopic"); + LLNotificationsUtil::add("UnableToFindHelpTopic"); } void LLButton::resetMouseDownTimer() |