diff options
author | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
commit | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (patch) | |
tree | 0be3b5e63506bf30edd3748f9e31740ae9ebbaa8 /indra/newview/lllandmarkactions.cpp | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
parent | a8192fbf60540e42dcff5f1efb8bf8cafbfac484 (diff) |
merge with release
Diffstat (limited to 'indra/newview/lllandmarkactions.cpp')
-rwxr-xr-x | indra/newview/lllandmarkactions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp index 6625a194fb..f893daaeb2 100755 --- a/indra/newview/lllandmarkactions.cpp +++ b/indra/newview/lllandmarkactions.cpp @@ -233,7 +233,7 @@ bool LLLandmarkActions::canCreateLandmarkHere() LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if(!agent_parcel) { - llwarns << "No agent region" << llendl; + LL_WARNS() << "No agent region" << LL_ENDL; return false; } if (agent_parcel->getAllowLandmark() @@ -252,13 +252,13 @@ void LLLandmarkActions::createLandmarkHere( { if(!gAgent.getRegion()) { - llwarns << "No agent region" << llendl; + LL_WARNS() << "No agent region" << LL_ENDL; return; } LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if (!agent_parcel) { - llwarns << "No agent parcel" << llendl; + LL_WARNS() << "No agent parcel" << LL_ENDL; return; } if (!canCreateLandmarkHere()) |