diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
| commit | 37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch) | |
| tree | 3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/newview/lllocationinputctrl.cpp | |
| parent | 1cf659d4481983684c4d5d749d95d56832dbc621 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
viewer-release merge (to 3.7.8)
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rwxr-xr-x | indra/newview/lllocationinputctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index dbdff11f11..af194aaa1d 100755 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -384,7 +384,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) mLocationContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); if (!mLocationContextMenu) { - llwarns << "Error loading navigation bar context menu" << llendl; + LL_WARNS() << "Error loading navigation bar context menu" << LL_ENDL; } getTextEntry()->setRightMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4)); @@ -777,7 +777,7 @@ void LLLocationInputCtrl::refreshLocation() (mTextEntry && mTextEntry->hasFocus()) || (mAddLandmarkBtn->hasFocus())) { - llwarns << "Location input should not be refreshed when having focus" << llendl; + LL_WARNS() << "Location input should not be refreshed when having focus" << LL_ENDL; return; } |