From bc8c95a7f744c3b0e077412449cf4f0ce4c28c98 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 10 Aug 2018 18:17:30 -0500 Subject: [PATCH] Minor cleanup. --- indra/llvfs/llvfs.cpp | 4 ++-- indra/llwindow/llwindowwin32.cpp | 2 +- indra/newview/llinventoryfunctions.cpp | 2 +- indra/newview/llskinningutil.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index ec0a7e21e..8d21a65dc 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -1586,8 +1586,8 @@ LLVFSBlock *LLVFS::findFreeBlock(S32 size, LLVFSFileBlock *immune) } - LL_INFOS() << "VFS: LRU: Aggressive: " << (S32)lru_list.size() << " files remain" << LL_ENDL; - dumpLockCounts(); + //LL_INFOS() << "VFS: LRU: Aggressive: " << (S32)lru_list.size() << " files remain" << LL_ENDL; + //dumpLockCounts(); // Now it's time to aggressively make more space // Delete the oldest 5MB of the vfs or enough to hold the file, which ever is larger diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 8a4bf7309..4a3a043d4 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -3057,7 +3057,7 @@ BOOL LLWindowWin32::setGamma(const F32 gamma) mCurrentGammaRamp[0][i] = mCurrentGammaRamp[1][i] = - mCurrentGammaRamp[2][i] = (WORD) value; + mCurrentGammaRamp[2][i] = (WORD) value; }; return SetDeviceGammaRamp ( mhDC, mCurrentGammaRamp ); diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 5bc0e3cfe..203dd7ec8 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -695,7 +695,7 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte return true; break; } - return false; +// return false; } bool LLIsType::operator()(LLInventoryCategory* cat, LLInventoryItem* item) diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index 672d55474..47c6d56b2 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -146,7 +146,7 @@ void LLSkinningUtil::checkSkinWeights(const LLVector4a* weights, U32 num_vertice const S32 max_joints = skin->mJointNames.size(); for (U32 j=0; j