11 files changed, 20 insertions, 20 deletions

diff --git a/linden/indra/llcharacter/llgesture.cpp b/linden/indra/llcharacter/llgesture.cpp
index 4ee29fe..83e4e35 100644
--- a/linden/indra/llcharacter/llgesture.cpp
+++ b/linden/indra/llcharacter/llgesture.cpp
@@ -304,7 +304,7 @@ BOOL LLGestureList::trigger(KEY key, MASK mask)
                 }
                 else
                 {
-                        llwarns << "NULL gesture in gesture list (" << i << ")" << llendl
+                        llwarns << "NULL gesture in gesture list (" << i << ")" << llendl;
                 }
         }
         return FALSE;
diff --git a/linden/indra/llcharacter/lljointsolverrp3.cpp b/linden/indra/llcharacter/lljointsolverrp3.cpp
index 0ea92a2..6599a76 100644
--- a/linden/indra/llcharacter/lljointsolverrp3.cpp
+++ b/linden/indra/llcharacter/lljointsolverrp3.cpp
@@ -211,7 +211,7 @@ void LLJointSolverRP3::solve()
         //-------------------------------------------------------------------------
         LLVector3 abacCompOrthoVec = abVec - acVec * ((abVec * acVec)/(acVec * acVec));
 
-//      llinfos << "abacCompOrthoVec : " << abacCompOrthoVec << llendl
+//      llinfos << "abacCompOrthoVec : " << abacCompOrthoVec << llendl;
 
         //-------------------------------------------------------------------------
         // compute the normal of the original ABC plane (and store for later)
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h
index 6794be4..37e922d 100644
--- a/linden/indra/llcommon/llerror.h
+++ b/linden/indra/llcommon/llerror.h
@@ -239,7 +239,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 */
 
 #define lllog(level, broadTag, narrowTag, once) \
-        { \
+        do { \
                 static LLError::CallSite _site( \
                         level, __FILE__, __LINE__, typeid(_LL_CLASS_TO_LOG), __FUNCTION__, broadTag, narrowTag, once);\
                 if (_site.shouldLog()) \
@@ -252,7 +252,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
                         LLError::End(); \
                         LLError::Log::flush(_out, _site); \
                 } \
-        }
+        } while(0)
 
 // DEPRECATED: Use the new macros that allow tags and *look* like macros.
 #define lldebugs        lllog(LLError::LEVEL_DEBUG, NULL, NULL, false)
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 4c94a52..b9b9e0b 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -4268,7 +4268,7 @@ LLFaceID LLVolume::generateFaceMask()
                 }
                 break;
         default:
-                llerrs << "Unknown profile!" << llendl
+                llerrs << "Unknown profile!" << llendl;
                 break;
         }
 
diff --git a/linden/indra/llmessage/lltemplatemessagebuilder.cpp b/linden/indra/llmessage/lltemplatemessagebuilder.cpp
index e641980..1e17018 100644
--- a/linden/indra/llmessage/lltemplatemessagebuilder.cpp
+++ b/linden/indra/llmessage/lltemplatemessagebuilder.cpp
@@ -730,7 +730,7 @@ static S32 buildBlock(U8* buffer, S32 buffer_size, const LLMessageBlock* templat
                                                         << "Attempted to pack "
                                                         << result + mvci.getSize()
                                                         << " bytes into a buffer with size "
-                                                        << buffer_size << "." << llendl
+                                                        << buffer_size << "." << llendl;
                                         }                                               
                                 }
                         }
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index dd33128..5ee3929 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -311,7 +311,7 @@ BOOL LLFont::addChar(const llwchar wch) const
                 // Try looking it up in the backup Unicode font
                 if (mFallbackFontp)
                 {
-                        //llinfos << "Trying to add glyph from fallback font!" << llendl
+                        //llinfos << "Trying to add glyph from fallback font!" << llendl;
                         LLFontList::iterator iter;
                         for(iter = mFallbackFontp->begin(); iter != mFallbackFontp->end(); iter++)
                         {
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 7efba51..4dedc03 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -1383,11 +1383,11 @@ void LLWindowMacOSX::setMouseClipping( BOOL b )
 
         if(b)
         {
-                //              llinfos << "setMouseClipping(TRUE)" << llendl
+                //              llinfos << "setMouseClipping(TRUE)" << llendl;
         }
         else
         {
-                //              llinfos << "setMouseClipping(FALSE)" << llendl
+                //              llinfos << "setMouseClipping(FALSE)" << llendl;
         }
 
         adjustCursorDecouple();
@@ -1405,7 +1405,7 @@ BOOL LLWindowMacOSX::setCursorPosition(const LLCoordWindow position)
 
         CGPoint newPosition;
 
-        //      llinfos << "setCursorPosition(" << screen_pos.mX << ", " << screen_pos.mY << ")" << llendl
+        //      llinfos << "setCursorPosition(" << screen_pos.mX << ", " << screen_pos.mY << ")" << llendl;
 
         newPosition.x = screen_pos.mX;
         newPosition.y = screen_pos.mY;
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index bf339f2..16a583a 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -671,12 +671,12 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
         glGetIntegerv(GL_DEPTH_BITS, &depthBits);
         glGetIntegerv(GL_STENCIL_BITS, &stencilBits);
         
-        llinfos << "GL buffer:" << llendl
-        llinfos << "  Red Bits " << S32(redBits) << llendl
-        llinfos << "  Green Bits " << S32(greenBits) << llendl
-        llinfos << "  Blue Bits " << S32(blueBits) << llendl
-        llinfos << "  Alpha Bits " << S32(alphaBits) << llendl
-        llinfos << "  Depth Bits " << S32(depthBits) << llendl
+        llinfos << "GL buffer:" << llendl;
+        llinfos << "  Red Bits " << S32(redBits) << llendl;
+        llinfos << "  Green Bits " << S32(greenBits) << llendl;
+        llinfos << "  Blue Bits " << S32(blueBits) << llendl;
+        llinfos << "  Alpha Bits " << S32(alphaBits) << llendl;
+        llinfos << "  Depth Bits " << S32(depthBits) << llendl;
         llinfos << "  Stencil Bits " << S32(stencilBits) << llendl;
 
         GLint colorBits = redBits + greenBits + blueBits + alphaBits;
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index ad7399e..df503ec 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -1233,9 +1233,9 @@ LLVector3 LLManipRotate::getConstraintAxis()
                 else
                 {
 #ifndef LL_RELEASE_FOR_DOWNLOAD
-                        llerrs << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl
+                        llerrs << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl;
 #else
-                        llwarns << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl
+                        llwarns << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl;
 #endif
                         axis.mV[0] = 1.f;
                 }
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index d8c3aa9..bde7242 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1396,7 +1396,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
                         else
                         {
                                 llwarns << "Inventory item for script " << info->mItemUUID
-                                        << " is no longer in agent inventory." << llendl
+                                        << " is no longer in agent inventory." << llendl;
                         }
 
                         // Find our window and close it if requested.
diff --git a/linden/indra/newview/llstatview.cpp b/linden/indra/newview/llstatview.cpp
index a38c012..9a3fcff 100644
--- a/linden/indra/newview/llstatview.cpp
+++ b/linden/indra/newview/llstatview.cpp
@@ -76,7 +76,7 @@ LLStatBar *LLStatView::addStat(const std::string& name, LLStat *statp,
 
 //      if (getStatBar(name))
 //      {
-//              llinfos << "LLStatView::addStat - Stat already exists!" << llendl
+//              llinfos << "LLStatView::addStat - Stat already exists!" << llendl;
 //              return NULL;
 //      }