From 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa Mon Sep 17 00:00:00 2001
From: Rider Linden <none@none>
Date: Mon, 13 Apr 2015 09:20:54 -0700
Subject: Formatting change to get past merge conflict.

---
 indra/llmessage/llavatarnamecache.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 616bd60f07..ef097c70f2 100755
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -399,9 +399,7 @@ void LLAvatarNameCache::requestNamesViaCapability()
 
     if (!url.empty())
     {
-        LL_DEBUGS("AvNameCache") << "LLAvatarNameCache::requestNamesViaCapability requested "
-            << ids << " ids"
-            << LL_ENDL;
+        LL_DEBUGS("AvNameCache") << "LLAvatarNameCache::requestNamesViaCapability requested " << ids << " ids" << LL_ENDL;
 
         std::string coroname = 
             LLCoros::instance().launch("LLAvatarNameCache::requestAvatarNameCache_",
-- 
cgit v1.2.3