livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change old style comments <ND> to <FS:ND> to avoid any future confusion/

master
Nicky 2012-12-16 05:19:32 +01:00
parent d396c5aa7b
commit ceea332a9c
27 changed files with 81 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/00-Common.cmake
View File

@ -173,11 +173,11 @@ if (LINUX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated ${CMAKE_CXX_FLAGS}")
endif (${CXX_VERSION_NUMBER} GREATER 429)
#<ND> 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.
#<FS:ND> 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)
#</ND>
#</FS:ND>
# End of hacks.

4
indra/llaudio/llaudioengine_openal.cpp
View File

@ -325,11 +325,11 @@ void LLAudioBufferOpenAL::cleanup()
alGetError(); // <ND/>
alDeleteBuffers(1, &mALBuffer);
// <ND> Print warning on possible leak.
// <FS:ND> Print warning on possible leak.
ALenum error = alGetError();
if( AL_NO_ERROR != error )
llwarns << "openal error: " << error << " possible memory leak hit" << llendl;
// </ND>
// </FS:ND>
mALBuffer = AL_NONE;
}

16
indra/llcommon/llmemory.cpp
View File

@ -720,11 +720,11 @@ void LLPrivateMemoryPool::LLMemoryBlock::freeMem(void* addr)
{
//bit index
// U32 idx = ((U32)addr - (U32)mBuffer - mDummySize) / mSlotSize ;
//<ND> 64 bit fix
// <FS:ND> 64 bit fix
unsigned char *p1 = reinterpret_cast<unsigned char*>(addr);
unsigned char *p2 = reinterpret_cast<unsigned char*>(mBuffer);
U32 idx = ( p1 - p2 - mDummySize) / mSlotSize ;
//</ND>
// </FS:ND>
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 ;
//<ND> 64 bit fix
// <FS:ND> 64 bit fix
unsigned char const *pBuffer = reinterpret_cast<unsigned char const*>( mBuffer );
unsigned char const *pAddr = reinterpret_cast<unsigned char const*>( addr );
return pBuffer <= pAddr && pBuffer + mBufferSize > pAddr ;
//</ND>
// </FS:ND>
}
//debug use
@ -1298,12 +1298,12 @@ void LLPrivateMemoryPool::LLMemoryChunk::addToAvailBlockList(LLMemoryBlock* blk)
U32 LLPrivateMemoryPool::LLMemoryChunk::getPageIndex(void * addr) // <ND/> 64 bit fix
{
// return (addr - (U32)mDataBuffer) / mMinBlockSize ;
//<ND> 64 bit fix
// <FS:ND> 64 bit fix
unsigned char *pAddr = reinterpret_cast< unsigned char* >( addr );
unsigned char *pBuffer = reinterpret_cast< unsigned char* >( mDataBuffer );
return (pAddr - pBuffer) / mMinBlockSize ;
//</ND>
// </FS:ND>
}
//for mAvailBlockList
@ -1642,12 +1642,12 @@ void LLPrivateMemoryPool::removeChunk(LLMemoryChunk* chunk)
U16 LLPrivateMemoryPool::findHashKey(const char* addr)
{
// return (((U32)addr) / CHUNK_SIZE) % mHashFactor ;
//<ND> 64 bit fix
// <FS:ND> 64 bit fix
unsigned char const *pAddr = reinterpret_cast< unsigned char const *>( addr );
U64 nAddr = reinterpret_cast<U64>(pAddr);
return ( nAddr / CHUNK_SIZE) % mHashFactor ;
//</ND>
// </FS:ND>
}
LLPrivateMemoryPool::LLMemoryChunk* LLPrivateMemoryPool::findChunk(const char* addr)

4
indra/llcommon/llsdserialize_xml.cpp
View File

@ -701,11 +701,11 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
return;
}
// <ND>: we've saved the element we need in a stack, so we can avoid readElement()
// <FS:ND>: 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();
// </ND>
// </FS:ND>
switch (element)
{

4
indra/llimage/llimage.cpp
View File

@ -52,7 +52,7 @@ bool LLImage::sUseNewByteRange = false;
S32 LLImage::sMinimalReverseByteRangePercent = 75;
LLPrivateMemoryPool* LLImageBase::sPrivatePoolp = NULL ;
// <ND> Report amount of failed buffer allocations
// <FS:ND> Report amount of failed buffer allocations
U32 LLImageBase::mAllocationErrors;
@ -65,7 +65,7 @@ U32 LLImageBase::getAllocationErrors()
{
return mAllocationErrors;
}
//</ND>
//</FS:ND>
//static
void LLImage::initClass(bool use_new_byte_range, S32 minimal_reverse_byte_range_percent)

4
indra/llimage/llimage.h
View File

@ -179,12 +179,12 @@ private:
public:
LLMemType::DeclareMemType& mMemType; // debug
// <ND> Report amount of failed buffer allocations
// <FS:ND> Report amount of failed buffer allocations
static void addAllocationError();
static U32 getAllocationErrors();
private:
static U32 mAllocationErrors;
// </ND>
// </FS:ND>
};
// Raw representation of an image (used for textures, and other uncompressed formats

8
indra/llinventory/llinventory.cpp
View File

@ -576,7 +576,7 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
#endif
}
// <ND> Helper functions
// <FS:ND> 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;
}
// </ND>
// </FS:ND>
// virtual
BOOL LLInventoryItem::importFile(LLFILE* fp)
@ -659,7 +659,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
// calls below.
char buffer[MAX_STRING]; /* Flawfinder: ignore */
// <ND> - cache speedups
// <FS:ND> - 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 */
// </ND>
// </FS:ND>
BOOL success = TRUE;

11
indra/llinventory/llpermissions.cpp
View File

@ -570,10 +570,10 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b
// File support
//
// <ND>
// <FS:ND>
void splitCacheDescOrName( char *aBuffer, char *&aJunk, char *&aValue );
int splitCacheLine( char *aBuffer, char *&aKeyword, char *&aValue );
// </ND>
// </FS:ND>
BOOL LLPermissions::importFile(LLFILE* fp)
{
@ -584,16 +584,19 @@ BOOL LLPermissions::importFile(LLFILE* fp)
// calls below.
char buffer[BUFSIZE]; /* Flawfinder: ignore */
//<ND> inventory optimization
// <FS:ND> 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 */
//</ND>
// </FS:ND>
while (!feof(fp))

4
indra/llplugin/llpluginclassmedia.cpp
View File

@ -864,13 +864,13 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
{
std::string message_name = message.getName();
// <ND> Enable gs treamer plugin to report title/artist of current stream
// <FS:ND> 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 // </ND>
else // </FS:ND>
if(message_name == "texture_params")
{
mRequestedTextureDepth = message.getValueS32("depth");

4
indra/llplugin/llpluginclassmedia.h
View File

@ -424,7 +424,7 @@ protected:
F64 mLoadedDuration;
public:
// <ND> Enable gstreamer plugin to report title/artist of current stream
// <FS:ND> 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;
// </ND>
// </FS:ND>
//--------------------------------------
//debug use only

8
indra/llplugin/llpluginprocessparent.cpp
View File

@ -170,10 +170,10 @@ void LLPluginProcessParent::init(const std::string &launcher_filename, const std
mDebug = debug;
setState(STATE_INITIALIZED);
// <ND> FIRE-3877; Port 0 = choose one for use as default. This was the standard behaviour of LLPluginProcessParent and the reasonable thing to do.
// <FS:ND> 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;
// </ND>
// </FS:ND>
}
bool LLPluginProcessParent::accept()
@ -332,7 +332,7 @@ void LLPluginProcessParent::idle(void)
killSockets();
// <ND> 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).
// <FS:ND> 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
}
// </ND>
// </FS:ND>
break;
}

4
indra/llplugin/llpluginprocessparent.h
View File

@ -192,10 +192,10 @@ private:
LLMutex mIncomingQueueMutex;
std::queue<LLPluginMessage> mIncomingQueue;
// <ND> 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.
// <FS:ND> 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;
// </ND>
// </FS:ND>
};
#endif // LL_LLPLUGINPROCESSPARENT_H

4
indra/llrender/llshadermgr.cpp
View File

@ -540,13 +540,13 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
return 0;
}
// <ND> Don't recompile shaders if it is already loaded.
// <FS:ND> 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 ];
}
// </ND>
// </FS:ND>
//read in from file
LLFILE* file = NULL;

4
indra/llui/lltabcontainer.cpp
View File

@ -603,14 +603,14 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
gFocusMgr.setMouseCapture(this);
tab_button->setFocus(TRUE);
}
//<ND> Fire-865; Scroll next/prev was not handled in IM tabs
//<FS:ND> 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();
//</ND>
//</FS:ND>
}
return handled;
}

4
indra/newview/lggcontactsetsfloater.cpp
View File

@ -80,10 +80,10 @@ void lggContactSetsFloater::onClose(bool app_quitting)
{
LLAvatarTracker::instance().removeObserver(sInstance);
// <ND> FIRE-3736; remove observers on all pending profile updates. Otherwise crash&burn when the update arrives but the floater is destroyed.
// <FS:ND> FIRE-3736; remove observers on all pending profile updates. Otherwise crash&burn when the update arrives but the floater is destroyed.
for (std::set<LLUUID>::iterator itr = profileImagePending.begin(); profileImagePending.end() != itr; ++itr)
LLAvatarPropertiesProcessor::getInstance()->removeObserver(*itr, this);
// </ND>
// </FS:ND>
sInstance = NULL;
destroy();

4
indra/newview/linux_tools/wrapper.sh
View File

@ -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` $@"
# <ND> [blerg] set LD_PRELOAD so plugins will pick up the correct sll libs, otherwise they will pick up the system versions.
# <FS:ND> [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
# <ND> End of hack; God will kill a kitten for this :(
# <FS:ND> End of hack; God will kill a kitten for this :(
# Have to deal specially with gridargs.dat; typical contents look like:

8
indra/newview/llfolderviewitem.cpp
View File

@ -1252,7 +1252,7 @@ bool LLFolderViewItem::isInSelection() const
{
return mIsSelected || (mParentFolder && mParentFolder->isInSelection());
}
// <ND> Don't bother with unneeded tooltips in inventor
// <FS:ND> 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;
}
// </ND>
// </FS:ND>
///----------------------------------------------------------------------------
/// Class LLFolderViewFolder
@ -2445,14 +2445,14 @@ void LLFolderViewFolder::setOpen(BOOL openitem)
void LLFolderViewFolder::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
{
// <ND> JIT Folders
// <FS:ND> JIT Folders
if( !mIsPopulated && mParentPanel )
{
lldebugs << "Lazy populating " << getName() << llendl;
mParentPanel->addSubItems( mFolderId, 0 );
mIsPopulated = true;
}
// </ND>
// </FS:ND>
BOOL was_open = mIsOpen;
mIsOpen = openitem;

10
indra/newview/llfolderviewitem.h
View File

@ -361,7 +361,7 @@ public:
EAcceptance* accept,
std::string& tooltip_msg);
// <ND> JIT folders
// <FS:ND> JIT folders
virtual bool isPreCreatedFolder()
{ return false; }
@ -389,11 +389,11 @@ typedef bool (*sort_order_f)(LLFolderViewItem* a, LLFolderViewItem* b);
class LLFolderViewFolder : public LLFolderViewItem
{
// <ND> JIT folders
// <FS:ND> JIT folders
LLUUID mFolderId;
class LLInventoryPanel *mParentPanel;
bool mIsPopulated;
// </ND>
// </FS:ND>
protected:
LLFolderViewFolder( const LLFolderViewItem::Params& );
@ -409,7 +409,7 @@ public:
typedef std::list<LLFolderViewFolder*> folders_t;
// <ND> JIT Folders
// <FS:ND> JIT Folders
void setPanel( LLInventoryPanel* aPanel )
{ mParentPanel = aPanel; }
@ -418,7 +418,7 @@ public:
virtual bool isPreCreatedFolder()
{ return !mIsPopulated; }
// </ND>
// </FS:ND>
protected:
items_t mItems;
folders_t mFolders;

4
indra/newview/llgesturemgr.cpp
View File

@ -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.
// <ND> FIRE-1624, try to parse text as command first. If that fails output it as chat
// <FS:ND> 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;
}
//</ND>
//</FS:ND>
const BOOL animate = FALSE;

13
indra/newview/llinventorymodel.cpp
View File

@ -709,7 +709,7 @@ void LLInventoryModel::addChangedMaskForLinks(const LLUUID& object_id, U32 mask)
if (!obj || obj->getIsLinkType())
return;
// <ND>: More efficient link updates
// <FS:ND>: 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);
}
//</ND>
// </FS:ND>
}
const LLUUID& LLInventoryModel::getLinkedItemID(const LLUUID& object_id) const
@ -1198,7 +1197,7 @@ void LLInventoryModel::deleteObject(const LLUUID& id)
mItemMap.erase(id);
// <ND>: Link processing efficiency
// <FS:ND>: 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 );
// </ND>
// </FS:ND>
//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;
}
//<ND> Link Processing Efficiency
// <FS:ND> Link Processing Efficiency
if( LLAssetType::lookupIsLinkType(item->getActualType()) )
mItemLinks[ item->getLinkedUUID() ].insert( item->getUUID() );
//</ND>
// </FS:ND>
mItemMap[item->getUUID()] = item;
}

4
indra/newview/llinventorymodel.h
View File

@ -161,11 +161,11 @@ private:
cat_map_t mCategoryMap;
item_map_t mItemMap;
//<ND> Link Processsing Efficiency
// <FS:ND> 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;
//</ND>
// </FS:ND>
// This last set of indices is used to map parents to children.
typedef std::map<LLUUID, cat_array_t*> parent_cat_map_t;

8
indra/newview/llinventorypanel.cpp
View File

@ -781,17 +781,17 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id, long aRecurs
}
}
// <ND> Subfolder JIT
// FIRE-3615; FIRE-3616: For some panels we get a zero UUID for top level folders here. </ND>
// <FS:ND> Subfolder JIT
// FIRE-3615; FIRE-3616: For some panels we get a zero UUID for top level folders here. </FS:ND>
// FIRE-3615: Disable this for now. It needs some serious rework.
// if( (id == getRootFolderID() || getRootFolderID().isNull() || id.isNull()) /*<ND/>: FIRE-3725, breaks worn tab on deeper nesting levels, remove for now: && aRecursionCount < 1*/ )
addSubItems( id, 0 );
// </ND>
// </FS:ND>
return itemp;
}
// <ND> JIT subfolder processing
// <FS:ND> JIT subfolder processing
void LLInventoryPanel::addSubItems(const LLUUID& id, long aRecursionCount)
{
LLInventoryObject const* objectp = gInventory.getObject(id);

4
indra/newview/llpanelmaininventory.cpp
View File

@ -219,14 +219,14 @@ BOOL LLPanelMainInventory::postBuild()
//worn_items_panel->getFilter()->markDefault();
worn_items_panel->getFilter()->setFilterObjectTypes(0xffffffff - (0x1 << LLInventoryType::IT_GESTURE));
// <ND> Do not go all crazy and recurse through the whole inventory
// <FS:ND> 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();
}
// </ND>
// </FS:ND>
worn_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, worn_items_panel, _1, _2));
}

4
indra/newview/llviewermedia_streamingaudio.cpp
View File

@ -164,7 +164,7 @@ LLPluginClassMedia* LLStreamingAudio_MediaPlugins::initializeMedia(const std::st
return media_source;
}
// <ND> stream metadata from plugin
// <FS:ND> stream metadata from plugin
bool LLStreamingAudio_MediaPlugins::hasNewMetadata()
{
if (!mMediaPlugin)
@ -184,4 +184,4 @@ std::string LLStreamingAudio_MediaPlugins::getCurrentTitle()
mTitle = mMediaPlugin->getTitle();
return mTitle;
}
// </ND>
// </FS:ND>

8
indra/newview/llviewermedia_streamingaudio.h
View File

@ -50,11 +50,11 @@ class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
/*virtual*/ F32 getGain();
/*virtual*/ std::string getURL();
// <ND> For FS metadata extraction
// <FS:ND> For FS metadata extraction
virtual bool hasNewMetadata();
virtual std::string getCurrentArtist();
virtual std::string getCurrentTitle();
// </ND>
// </FS:ND>
private:
LLPluginClassMedia* initializeMedia(const std::string& media_type);
@ -63,10 +63,10 @@ private:
std::string mURL;
// <ND> stream metadata from plugin
// <FS:ND> stream metadata from plugin
std::string mArtist;
std::string mTitle;
// </ND>
// </FS:ND>
F32 mGain;
};

2
indra/newview/llviewerobject.cpp
View File

@ -3024,7 +3024,7 @@ LLViewerInventoryItem* LLViewerObject::getInventoryItemByAsset(const LLUUID& ass
{
LLInventoryObject* obj = *it;
if(obj->getType() != LLAssetType::AT_CATEGORY
&& obj->getType() != LLAssetType::AT_NONE ) // <ND> check for AT_NONE too loadTaskInvFile can create such objects for "Contants"
&& obj->getType() != LLAssetType::AT_NONE ) // <FS:ND> check for AT_NONE too loadTaskInvFile can create such objects for "Contants"
{
// *FIX: gank-ass down cast!
item = (LLViewerInventoryItem*)obj;

4
indra/newview/llviewerwindow.cpp
View File

@ -823,10 +823,10 @@ public:
}
}
// <ND> Report amount of failed texture buffer allocations if any.
// <FS:ND> 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() ) );
// </ND>
// </FS:ND>
}
void draw()