diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 40b01d2e28..6c2724bef3 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -173,11 +173,11 @@ if (LINUX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated ${CMAKE_CXX_FLAGS}")
endif (${CXX_VERSION_NUMBER} GREATER 429)
- # Disable unused-but-set-variable for GCC >= 4.6. It causes a lot of warning/errors all over the source. Fixing that would result in changing a good amount of files.
+ # Disable unused-but-set-variable for GCC >= 4.6. It causes a lot of warning/errors all over the source. Fixing that would result in changing a good amount of files.
if(${CXX_VERSION_NUMBER} GREATER 460)
set(CMAKE_CXX_FLAGS "-Wno-unused-but-set-variable ${CMAKE_CXX_FLAGS}")
endif (${CXX_VERSION_NUMBER} GREATER 460)
- #
+ #
# End of hacks.
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp
index 1bf9e21076..8f237f4c61 100644
--- a/indra/llaudio/llaudioengine_openal.cpp
+++ b/indra/llaudio/llaudioengine_openal.cpp
@@ -325,11 +325,11 @@ void LLAudioBufferOpenAL::cleanup()
alGetError(); //
alDeleteBuffers(1, &mALBuffer);
- // Print warning on possible leak.
+ // Print warning on possible leak.
ALenum error = alGetError();
if( AL_NO_ERROR != error )
llwarns << "openal error: " << error << " possible memory leak hit" << llendl;
- //
+ //
mALBuffer = AL_NONE;
}
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 305d20476b..170d17fea5 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -720,11 +720,11 @@ void LLPrivateMemoryPool::LLMemoryBlock::freeMem(void* addr)
{
//bit index
// U32 idx = ((U32)addr - (U32)mBuffer - mDummySize) / mSlotSize ;
- // 64 bit fix
+ // 64 bit fix
unsigned char *p1 = reinterpret_cast(addr);
unsigned char *p2 = reinterpret_cast(mBuffer);
U32 idx = ( p1 - p2 - mDummySize) / mSlotSize ;
- //
+ //
U32* bits = &mUsageBits ;
if(idx >= 32)
@@ -932,12 +932,12 @@ bool LLPrivateMemoryPool::LLMemoryChunk::empty()
bool LLPrivateMemoryPool::LLMemoryChunk::containsAddress(const char* addr) const
{
//return (U32)mBuffer <= (U32)addr && (U32)mBuffer + mBufferSize > (U32)addr ;
- // 64 bit fix
+ // 64 bit fix
unsigned char const *pBuffer = reinterpret_cast( mBuffer );
unsigned char const *pAddr = reinterpret_cast( addr );
return pBuffer <= pAddr && pBuffer + mBufferSize > pAddr ;
- //
+ //
}
//debug use
@@ -1298,12 +1298,12 @@ void LLPrivateMemoryPool::LLMemoryChunk::addToAvailBlockList(LLMemoryBlock* blk)
U32 LLPrivateMemoryPool::LLMemoryChunk::getPageIndex(void * addr) // 64 bit fix
{
// return (addr - (U32)mDataBuffer) / mMinBlockSize ;
- // 64 bit fix
+ // 64 bit fix
unsigned char *pAddr = reinterpret_cast< unsigned char* >( addr );
unsigned char *pBuffer = reinterpret_cast< unsigned char* >( mDataBuffer );
return (pAddr - pBuffer) / mMinBlockSize ;
- //
+ //
}
//for mAvailBlockList
@@ -1642,12 +1642,12 @@ void LLPrivateMemoryPool::removeChunk(LLMemoryChunk* chunk)
U16 LLPrivateMemoryPool::findHashKey(const char* addr)
{
// return (((U32)addr) / CHUNK_SIZE) % mHashFactor ;
- // 64 bit fix
+ // 64 bit fix
unsigned char const *pAddr = reinterpret_cast< unsigned char const *>( addr );
U64 nAddr = reinterpret_cast(pAddr);
return ( nAddr / CHUNK_SIZE) % mHashFactor ;
- //
+ //
}
LLPrivateMemoryPool::LLMemoryChunk* LLPrivateMemoryPool::findChunk(const char* addr)
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index ecba9ccc14..9ca56ba96a 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -701,11 +701,11 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
return;
}
- // : we've saved the element we need in a stack, so we can avoid readElement()
+ // : we've saved the element we need in a stack, so we can avoid readElement()
// Element element = readElement(name);
Element element = mStackElements.top(); //readElement(name);
mStackElements.pop();
- //
+ //
switch (element)
{
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index bb484b1fd1..b575592dd5 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -52,7 +52,7 @@ bool LLImage::sUseNewByteRange = false;
S32 LLImage::sMinimalReverseByteRangePercent = 75;
LLPrivateMemoryPool* LLImageBase::sPrivatePoolp = NULL ;
-// Report amount of failed buffer allocations
+// Report amount of failed buffer allocations
U32 LLImageBase::mAllocationErrors;
@@ -65,7 +65,7 @@ U32 LLImageBase::getAllocationErrors()
{
return mAllocationErrors;
}
-//
+//
//static
void LLImage::initClass(bool use_new_byte_range, S32 minimal_reverse_byte_range_percent)
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index 96105dc716..caeb11f956 100644
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -179,12 +179,12 @@ private:
public:
LLMemType::DeclareMemType& mMemType; // debug
- // Report amount of failed buffer allocations
+ // Report amount of failed buffer allocations
static void addAllocationError();
static U32 getAllocationErrors();
private:
static U32 mAllocationErrors;
- //
+ //
};
// Raw representation of an image (used for textures, and other uncompressed formats
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 1a8b6f16ce..3d114ae3d1 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -576,7 +576,7 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
#endif
}
-// Helper functions
+// Helper functions
inline bool isWS( char aVal )
{
return aVal == ' ' || aVal == '\t' || aVal == '\r' || aVal == '\n';
@@ -650,7 +650,7 @@ int splitCacheLine( char *aBuffer, char *&aKeyword, char *&aValue )
return nKWLen;
}
-//
+//
// virtual
BOOL LLInventoryItem::importFile(LLFILE* fp)
@@ -659,7 +659,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
// calls below.
char buffer[MAX_STRING]; /* Flawfinder: ignore */
- // - cache speedups
+ // - cache speedups
//char keyword[MAX_STRING]; /* Flawfinder: ignore */
//char valuestr[MAX_STRING]; /* Flawfinder: ignore */
//char junk[MAX_STRING]; /* Flawfinder: ignore */
@@ -668,7 +668,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
char *keyword; /* Flawfinder: ignore */
char *valuestr; /* Flawfinder: ignore */
char *junk; /* Flawfinder: ignore */
- //
+ //
BOOL success = TRUE;
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index c076b03828..7cb0c84d86 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -570,10 +570,10 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b
// File support
//
-//
+//
void splitCacheDescOrName( char *aBuffer, char *&aJunk, char *&aValue );
int splitCacheLine( char *aBuffer, char *&aKeyword, char *&aValue );
-//
+//
BOOL LLPermissions::importFile(LLFILE* fp)
{
@@ -584,16 +584,19 @@ BOOL LLPermissions::importFile(LLFILE* fp)
// calls below.
char buffer[BUFSIZE]; /* Flawfinder: ignore */
- // inventory optimization
+ // inventory optimization
+
//char keyword[256]; /* Flawfinder: ignore */
//char valuestr[256]; /* Flawfinder: ignore */
//U32 mask;
//keyword[0] = '\0';
//valuestr[0] = '\0';
//char uuid_str[256]; /* Flawfinder: ignore */
+
char *keyword; /* Flawfinder: ignore */
char *valuestr; /* Flawfinder: ignore */
- //
+
+ //
while (!feof(fp))
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index c7c4f973a9..7ef71223e9 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -864,13 +864,13 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
{
std::string message_name = message.getName();
- // Enable gs treamer plugin to report title/artist of current stream
+ // Enable gs treamer plugin to report title/artist of current stream
if( message_name == "ndMediadata_change" )
{
mTitle = message.getValue( "title" );
mArtist = message.getValue( "artist" );
}
- else //
+ else //
if(message_name == "texture_params")
{
mRequestedTextureDepth = message.getValueS32("depth");
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index bd390c3857..fdf6ce1dfd 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -424,7 +424,7 @@ protected:
F64 mLoadedDuration;
public:
- // Enable gstreamer plugin to report title/artist of current stream
+ // Enable gstreamer plugin to report title/artist of current stream
std::string const& getArtist() const
{ return mArtist; }
@@ -434,7 +434,7 @@ public:
private:
std::string mArtist;
std::string mTitle;
- //
+ //
//--------------------------------------
//debug use only
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index f9b0929a02..5deeaa1324 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -170,10 +170,10 @@ void LLPluginProcessParent::init(const std::string &launcher_filename, const std
mDebug = debug;
setState(STATE_INITIALIZED);
- // FIRE-3877; Port 0 = choose one for use as default. This was the standard behaviour of LLPluginProcessParent and the reasonable thing to do.
+ // FIRE-3877; Port 0 = choose one for use as default. This was the standard behaviour of LLPluginProcessParent and the reasonable thing to do.
mPortToBind = 0;
mBindRetries = 0;
- //
+ //
}
bool LLPluginProcessParent::accept()
@@ -332,7 +332,7 @@ void LLPluginProcessParent::idle(void)
killSockets();
- // FIRE-3877; Some drivers, eg bigfoot. Refuse to tell us which port is used when the socket is bound on port 0 (= choose a free port).
+ // FIRE-3877; Some drivers, eg bigfoot. Refuse to tell us which port is used when the socket is bound on port 0 (= choose a free port).
// If not out of retry attempts, choose a random port between 5500 - 60000 and try again.
if( mBindRetries > 10 ) //In theory we could have bad luck and randomly draft already used ports each try. In practice we already deal with a buggy driver anyway. So just fail instead hogging resources in a loop.
errorState();
@@ -343,7 +343,7 @@ void LLPluginProcessParent::idle(void)
setState( STATE_INITIALIZED );
idle_again = true; // Just try a new loop to bind the socket
}
- //
+ //
break;
}
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 0bfe9d638e..1ecda8821f 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -192,10 +192,10 @@ private:
LLMutex mIncomingQueueMutex;
std::queue mIncomingQueue;
- // FIRE-3877; Bind to a fixed port. Some network drivers (Bigfoot) refuse to tell us to which port a socket is bound if 0 (= choose one) was used.
+ // FIRE-3877; Bind to a fixed port. Some network drivers (Bigfoot) refuse to tell us to which port a socket is bound if 0 (= choose one) was used.
U32 mPortToBind;
U32 mBindRetries;
- //
+ //
};
#endif // LL_LLPLUGINPROCESSPARENT_H
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 66b806a917..23eef22922 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -540,13 +540,13 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
return 0;
}
- // Don't recompile shaders if it is already loaded.
+ // Don't recompile shaders if it is already loaded.
if( mShaderObjects.end() != mShaderObjects.find(filename) )
{
LL_INFOS("ShaderLoading") << "Reusing compiled shader for " << filename << LL_ENDL;
return mShaderObjects[ filename ];
}
- //
+ //
//read in from file
LLFILE* file = NULL;
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 8736eb89b9..ea34d478b0 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -603,14 +603,14 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
gFocusMgr.setMouseCapture(this);
tab_button->setFocus(TRUE);
}
- // Fire-865; Scroll next/prev was not handled in IM tabs
+ // Fire-865; Scroll next/prev was not handled in IM tabs
else if (mPrevArrowBtn && mPrevArrowBtn->getRect().pointInRect(x, y))
{
selectPrevTab();
}
else if (mNextArrowBtn && mNextArrowBtn->getRect().pointInRect(x, y))
selectNextTab();
- //
+ //
}
return handled;
}
diff --git a/indra/newview/lggcontactsetsfloater.cpp b/indra/newview/lggcontactsetsfloater.cpp
index 280885502d..475e2fd81b 100644
--- a/indra/newview/lggcontactsetsfloater.cpp
+++ b/indra/newview/lggcontactsetsfloater.cpp
@@ -80,10 +80,10 @@ void lggContactSetsFloater::onClose(bool app_quitting)
{
LLAvatarTracker::instance().removeObserver(sInstance);
- // FIRE-3736; remove observers on all pending profile updates. Otherwise crash&burn when the update arrives but the floater is destroyed.
+ // FIRE-3736; remove observers on all pending profile updates. Otherwise crash&burn when the update arrives but the floater is destroyed.
for (std::set::iterator itr = profileImagePending.begin(); profileImagePending.end() != itr; ++itr)
LLAvatarPropertiesProcessor::getInstance()->removeObserver(*itr, this);
- //
+ //
sInstance = NULL;
destroy();
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index 72380df3b7..56528abeba 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -119,7 +119,7 @@ export LD_LIBRARY_PATH="$PWD/lib:${LD_LIBRARY_PATH}"
# AO: experimentally removing to allow --settings on the command line w/o error. FIRE-1031
#export SL_OPT="`cat etc/gridargs.dat` $@"
-# [blerg] set LD_PRELOAD so plugins will pick up the correct sll libs, otherwise they will pick up the system versions.
+# [blerg] set LD_PRELOAD so plugins will pick up the correct sll libs, otherwise they will pick up the system versions.
LLCRYPTO="`pwd`/lib/libcrypto.so.1.0.0"
LLSSL="`pwd`/lib/libssl.so.1.0.0"
if [ -f ${LLCRYPTO} ]
@@ -130,7 +130,7 @@ if [ -f ${LLSSL} ]
then
export LD_PRELOAD="${LD_PRELOAD}:${LLSSL}"
fi
-# End of hack; God will kill a kitten for this :(
+# End of hack; God will kill a kitten for this :(
# Have to deal specially with gridargs.dat; typical contents look like:
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 9bcf8178cd..3722564da1 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -1252,7 +1252,7 @@ bool LLFolderViewItem::isInSelection() const
{
return mIsSelected || (mParentFolder && mParentFolder->isInSelection());
}
-// Don't bother with unneeded tooltips in inventor
+// Don't bother with unneeded tooltips in inventor
BOOL LLFolderViewItem::handleToolTip(S32 x, S32 y, MASK mask)
{
@@ -1276,7 +1276,7 @@ BOOL LLFolderViewItem::handleToolTip(S32 x, S32 y, MASK mask)
return FALSE;
}
-//
+//
///----------------------------------------------------------------------------
/// Class LLFolderViewFolder
@@ -2445,14 +2445,14 @@ void LLFolderViewFolder::setOpen(BOOL openitem)
void LLFolderViewFolder::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
{
- // JIT Folders
+ // JIT Folders
if( !mIsPopulated && mParentPanel )
{
lldebugs << "Lazy populating " << getName() << llendl;
mParentPanel->addSubItems( mFolderId, 0 );
mIsPopulated = true;
}
- //
+ //
BOOL was_open = mIsOpen;
mIsOpen = openitem;
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index 87ec7eb8c0..a6bdb5e7bb 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -361,7 +361,7 @@ public:
EAcceptance* accept,
std::string& tooltip_msg);
- // JIT folders
+ // JIT folders
virtual bool isPreCreatedFolder()
{ return false; }
@@ -389,11 +389,11 @@ typedef bool (*sort_order_f)(LLFolderViewItem* a, LLFolderViewItem* b);
class LLFolderViewFolder : public LLFolderViewItem
{
- // JIT folders
+ // JIT folders
LLUUID mFolderId;
class LLInventoryPanel *mParentPanel;
bool mIsPopulated;
- //
+ //
protected:
LLFolderViewFolder( const LLFolderViewItem::Params& );
@@ -409,7 +409,7 @@ public:
typedef std::list folders_t;
- // JIT Folders
+ // JIT Folders
void setPanel( LLInventoryPanel* aPanel )
{ mParentPanel = aPanel; }
@@ -418,7 +418,7 @@ public:
virtual bool isPreCreatedFolder()
{ return !mIsPopulated; }
- //
+ //
protected:
items_t mItems;
folders_t mFolders;
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index dd1bf4a11c..6d22054751 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -1001,13 +1001,13 @@ void LLGestureMgr::runStep(LLMultiGesture* gesture, LLGestureStep* step)
// Don't animate the nodding, as this might not blend with
// other playing animations.
- // FIRE-1624, try to parse text as command first. If that fails output it as chat
+ // FIRE-1624, try to parse text as command first. If that fails output it as chat
if( !cmd_line_chat( chat_text, CHAT_TYPE_NORMAL, true ) )
{
gesture->mCurrentStep++;
break;
}
- //
+ //
const BOOL animate = FALSE;
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 29d92fbb66..2e11c4a89c 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -709,7 +709,7 @@ void LLInventoryModel::addChangedMaskForLinks(const LLUUID& object_id, U32 mask)
if (!obj || obj->getIsLinkType())
return;
-// : More efficient link updates
+// : More efficient link updates
//
// LLInventoryModel::cat_array_t cat_array;
// LLInventoryModel::item_array_t item_array;
@@ -745,9 +745,8 @@ void LLInventoryModel::addChangedMaskForLinks(const LLUUID& object_id, U32 mask)
for( item_links_set_t::iterator itrIds = itr->second.begin(); itr->second.end() != itrIds; ++itrIds )
addChangedMask(mask, *itrIds);
}
- //
-
+ //
}
const LLUUID& LLInventoryModel::getLinkedItemID(const LLUUID& object_id) const
@@ -1198,7 +1197,7 @@ void LLInventoryModel::deleteObject(const LLUUID& id)
mItemMap.erase(id);
- // : Link processing efficiency
+ // : Link processing efficiency
if(LLAssetType::lookupIsLinkType(obj->getActualType()))
{
LLUUID idLinked(obj->getLinkedUUID());
@@ -1208,7 +1207,7 @@ void LLInventoryModel::deleteObject(const LLUUID& id)
}
else
mItemLinks.erase( id );
- //
+ //
//mInventory.erase(id);
@@ -1638,10 +1637,10 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
llinfos << "Adding broken link [ name: " << item->getName() << " itemID: " << item->getUUID() << " assetID: " << item->getAssetUUID() << " ) parent: " << item->getParentUUID() << llendl;
}
- // Link Processing Efficiency
+ // Link Processing Efficiency
if( LLAssetType::lookupIsLinkType(item->getActualType()) )
mItemLinks[ item->getLinkedUUID() ].insert( item->getUUID() );
- //
+ //
mItemMap[item->getUUID()] = item;
}
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 4dba3fcb88..3bb3a2961d 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -161,11 +161,11 @@ private:
cat_map_t mCategoryMap;
item_map_t mItemMap;
- // Link Processsing Efficiency
+ // Link Processsing Efficiency
typedef std::set< LLUUID > item_links_set_t;
typedef std::map< LLUUID, item_links_set_t > item_links_map_t;
item_links_map_t mItemLinks;
- //
+ //
// This last set of indices is used to map parents to children.
typedef std::map parent_cat_map_t;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index d8c2d0a376..d6acef5356 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -781,17 +781,17 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id, long aRecurs
}
}
- // Subfolder JIT
- // FIRE-3615; FIRE-3616: For some panels we get a zero UUID for top level folders here.
+ // Subfolder JIT
+ // FIRE-3615; FIRE-3616: For some panels we get a zero UUID for top level folders here.
// FIRE-3615: Disable this for now. It needs some serious rework.
// if( (id == getRootFolderID() || getRootFolderID().isNull() || id.isNull()) /*: FIRE-3725, breaks worn tab on deeper nesting levels, remove for now: && aRecursionCount < 1*/ )
addSubItems( id, 0 );
- //
+ //
return itemp;
}
-// JIT subfolder processing
+// JIT subfolder processing
void LLInventoryPanel::addSubItems(const LLUUID& id, long aRecursionCount)
{
LLInventoryObject const* objectp = gInventory.getObject(id);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 25d1916b82..8092bac285 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -219,14 +219,14 @@ BOOL LLPanelMainInventory::postBuild()
//worn_items_panel->getFilter()->markDefault();
worn_items_panel->getFilter()->setFilterObjectTypes(0xffffffff - (0x1 << LLInventoryType::IT_GESTURE));
- // Do not go all crazy and recurse through the whole inventory
+ // Do not go all crazy and recurse through the whole inventory
// worn_items_panel->openAllFolders();
if( worn_items_panel->getRootFolder() )
{
worn_items_panel->getRootFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_NO);
worn_items_panel->getRootFolder()->arrangeAll();
}
- //
+ //
worn_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, worn_items_panel, _1, _2));
}
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp
index ed6b34e3b4..dd19f2c0bc 100644
--- a/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/indra/newview/llviewermedia_streamingaudio.cpp
@@ -164,7 +164,7 @@ LLPluginClassMedia* LLStreamingAudio_MediaPlugins::initializeMedia(const std::st
return media_source;
}
-// stream metadata from plugin
+// stream metadata from plugin
bool LLStreamingAudio_MediaPlugins::hasNewMetadata()
{
if (!mMediaPlugin)
@@ -184,4 +184,4 @@ std::string LLStreamingAudio_MediaPlugins::getCurrentTitle()
mTitle = mMediaPlugin->getTitle();
return mTitle;
}
-//
+//
diff --git a/indra/newview/llviewermedia_streamingaudio.h b/indra/newview/llviewermedia_streamingaudio.h
index 4e3fc04716..cca71608a6 100644
--- a/indra/newview/llviewermedia_streamingaudio.h
+++ b/indra/newview/llviewermedia_streamingaudio.h
@@ -50,11 +50,11 @@ class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
/*virtual*/ F32 getGain();
/*virtual*/ std::string getURL();
- // For FS metadata extraction
+ // For FS metadata extraction
virtual bool hasNewMetadata();
virtual std::string getCurrentArtist();
virtual std::string getCurrentTitle();
- //
+ //
private:
LLPluginClassMedia* initializeMedia(const std::string& media_type);
@@ -63,10 +63,10 @@ private:
std::string mURL;
- // stream metadata from plugin
+ // stream metadata from plugin
std::string mArtist;
std::string mTitle;
- //
+ //
F32 mGain;
};
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d8a17367d7..bd95f240bd 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3024,7 +3024,7 @@ LLViewerInventoryItem* LLViewerObject::getInventoryItemByAsset(const LLUUID& ass
{
LLInventoryObject* obj = *it;
if(obj->getType() != LLAssetType::AT_CATEGORY
- && obj->getType() != LLAssetType::AT_NONE ) // check for AT_NONE too loadTaskInvFile can create such objects for "Contants"
+ && obj->getType() != LLAssetType::AT_NONE ) // check for AT_NONE too loadTaskInvFile can create such objects for "Contants"
{
// *FIX: gank-ass down cast!
item = (LLViewerInventoryItem*)obj;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index faf54a9a7c..067e3a0fb9 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -823,10 +823,10 @@ public:
}
}
- // Report amount of failed texture buffer allocations if any.
+ // Report amount of failed texture buffer allocations if any.
if( LLImageBase::getAllocationErrors() )
addText( xpos, ypos, llformat( "# textures discared due to insufficent memory %ld", LLImageBase::getAllocationErrors() ) );
- //
+ //
}
void draw()