Merge downstream version 3.7.8 code

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp
index 493909cf9c..4c6075d6b5 100755
--- a/indra/llinventory/lllandmark.cpp
+++ b/indra/llinventory/lllandmark.cpp
@@ -128,7 +128,7 @@ LLLandmark* LLLandmark::constructFromString(const char *buffer)
 			goto error;
 		}
 		cur += chars_read;
-		// llinfos << "Landmark read: " << pos << llendl;
+		// LL_INFOS() << "Landmark read: " << pos << LL_ENDL;
 		
 		return new LLLandmark(pos);
 	}
@@ -155,7 +155,7 @@ LLLandmark* LLLandmark::constructFromString(const char *buffer)
 	}
 
  error:
-	llinfos << "Bad Landmark Asset: bad _DATA_ block." << llendl;
+	LL_INFOS() << "Bad Landmark Asset: bad _DATA_ block." << LL_ENDL;
 	return NULL;
 }
 
@@ -176,7 +176,7 @@ void LLLandmark::requestRegionHandle(
 	if(region_id.isNull())
 	{
 		// don't bother with checking - it's 0.
-		lldebugs << "requestRegionHandle: null" << llendl;
+		LL_DEBUGS() << "requestRegionHandle: null" << LL_ENDL;
 		if(callback)
 		{
 			const U64 U64_ZERO = 0;
@@ -187,7 +187,7 @@ void LLLandmark::requestRegionHandle(
 	{
 		if(region_id == mLocalRegion.first)
 		{
-			lldebugs << "requestRegionHandle: local" << llendl;
+			LL_DEBUGS() << "requestRegionHandle: local" << LL_ENDL;
 			if(callback)
 			{
 				callback(region_id, mLocalRegion.second);
@@ -198,14 +198,14 @@ void LLLandmark::requestRegionHandle(
 			region_map_t::iterator it = mRegions.find(region_id);
 			if(it == mRegions.end())
 			{
-				lldebugs << "requestRegionHandle: upstream" << llendl;
+				LL_DEBUGS() << "requestRegionHandle: upstream" << LL_ENDL;
 				if(callback)
 				{
 					region_callback_map_t::value_type vt(region_id, callback);
 					sRegionCallbackMap.insert(vt);
 				}
-				lldebugs << "Landmark requesting information about: "
-						 << region_id << llendl;
+				LL_DEBUGS() << "Landmark requesting information about: "
+						 << region_id << LL_ENDL;
 				msg->newMessage("RegionHandleRequest");
 				msg->nextBlock("RequestBlock");
 				msg->addUUID("RegionID", region_id);
@@ -214,7 +214,7 @@ void LLLandmark::requestRegionHandle(
 			else if(callback)
 			{
 				// we have the answer locally - just call the callack.
-				lldebugs << "requestRegionHandle: ready" << llendl;
+				LL_DEBUGS() << "requestRegionHandle: ready" << LL_ENDL;
 				callback(region_id, (*it).second.mRegionHandle);
 			}
 		}
@@ -248,8 +248,8 @@ void LLLandmark::processRegionIDAndHandle(LLMessageSystem* msg, void**)
 #if LL_DEBUG
 	U32 grid_x, grid_y;
 	grid_from_region_handle(info.mRegionHandle, &grid_x, &grid_y);
-	lldebugs << "Landmark got reply for region: " << region_id << " "
-			 << grid_x << "," << grid_y << llendl;
+	LL_DEBUGS() << "Landmark got reply for region: " << region_id << " "
+			 << grid_x << "," << grid_y << LL_ENDL;
 #endif
 
 	// make all the callbacks here.