Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge

Merge Maint A to development

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index acb1a37ff5..5e1e4c5272 100644
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -68,19 +68,19 @@ void LLAgentUI::buildSLURL(LLSLURL& slurl, const bool escaped /*= true*/)
 }
 
 //static
-BOOL LLAgentUI::checkAgentDistance(const LLVector3& pole, F32 radius)
+bool LLAgentUI::checkAgentDistance(const LLVector3& pole, F32 radius)
 {
 	F32 delta_x = gAgent.getPositionAgent().mV[VX] - pole.mV[VX];
 	F32 delta_y = gAgent.getPositionAgent().mV[VY] - pole.mV[VY];
 	
 	return  sqrt( delta_x* delta_x + delta_y* delta_y ) < radius;
 }
-BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region)
+bool LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region)
 {
 	LLViewerRegion* region = gAgent.getRegion();
 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 
-	if (!region || !parcel) return FALSE;
+	if (!region || !parcel) return false;
 
 	S32 pos_x = S32(agent_pos_region.mV[VX] + 0.5f);
 	S32 pos_y = S32(agent_pos_region.mV[VY] + 0.5f);
@@ -186,9 +186,9 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
 		}
 	}
 	str = buffer;
-	return TRUE;
+	return true;
 }
-BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt)
+bool LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt)
 {
 	return buildLocationString(str,fmt, gAgent.getPositionAgent());
 }