EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a bunch of llinfos spam to not show up in release mode. Removed some other legacy comments.master
parent
8294f69ea3
commit
0be5ce0a59
|
|
@ -1283,8 +1283,9 @@ void LLAppearanceMgr::linkAll(const LLUUID& cat_uuid,
|
|||
|
||||
const LLViewerInventoryCategory *cat = gInventory.getCategory(cat_uuid);
|
||||
const std::string cat_name = cat ? cat->getName() : "CAT NOT FOUND";
|
||||
|
||||
llinfos << "Linking Item [ name:" << item->getName() << " UUID:" << item->getUUID() << " ] to Category [ name:" << cat_name << " UUID:" << cat_uuid << " ] " << llendl; // Seraph remove for 2.1
|
||||
#ifndef LL_RELEASE_FOR_DOWNLOAD
|
||||
llinfos << "Linking Item [ name:" << item->getName() << " UUID:" << item->getUUID() << " ] to Category [ name:" << cat_name << " UUID:" << cat_uuid << " ] " << llendl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1353,13 +1354,24 @@ void LLAppearanceMgr::updateCOF(const LLUUID& category, bool append)
|
|||
llinfos << "creating LLUpdateAppearanceOnDestroy" << llendl;
|
||||
LLPointer<LLInventoryCallback> link_waiter = new LLUpdateAppearanceOnDestroy;
|
||||
|
||||
llinfos << "Linking body items" << llendl; // Seraph remove for 2.1
|
||||
#ifndef LL_RELEASE_FOR_DOWNLOAD
|
||||
llinfos << "Linking body items" << llendl;
|
||||
#endif
|
||||
linkAll(cof, body_items, link_waiter);
|
||||
llinfos << "Linking wear items" << llendl; // Seraph remove for 2.1
|
||||
|
||||
#ifndef LL_RELEASE_FOR_DOWNLOAD
|
||||
llinfos << "Linking wear items" << llendl;
|
||||
#endif
|
||||
linkAll(cof, wear_items, link_waiter);
|
||||
llinfos << "Linking obj items" << llendl; // Seraph remove for 2.1
|
||||
|
||||
#ifndef LL_RELEASE_FOR_DOWNLOAD
|
||||
llinfos << "Linking obj items" << llendl;
|
||||
#endif
|
||||
linkAll(cof, obj_items, link_waiter);
|
||||
llinfos << "Linking gesture items" << llendl; // Seraph remove for 2.1
|
||||
|
||||
#ifndef LL_RELEASE_FOR_DOWNLOAD
|
||||
llinfos << "Linking gesture items" << llendl;
|
||||
#endif
|
||||
linkAll(cof, gest_items, link_waiter);
|
||||
|
||||
// Add link to outfit if category is an outfit.
|
||||
|
|
|
|||
|
|
@ -1262,12 +1262,6 @@ void LLInventoryModel::addCategory(LLViewerInventoryCategory* category)
|
|||
|
||||
void LLInventoryModel::addItem(LLViewerInventoryItem* item)
|
||||
{
|
||||
/*
|
||||
const LLViewerInventoryCategory* cat = gInventory.getCategory(item->getParentUUID()); // Seraph remove for 2.1
|
||||
const std::string cat_name = cat ? cat->getName() : "CAT NOT FOUND"; // Seraph remove for 2.1
|
||||
llinfos << "Added item [ name:" << item->getName() << " UUID:" << item->getUUID() << " type:" << item->getActualType() << " ] to folder [ name:" << cat_name << " uuid:" << item->getParentUUID() << " ]" << llendl; // Seraph remove for 2.1
|
||||
*/
|
||||
|
||||
llassert(item);
|
||||
if(item)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -782,7 +782,6 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
|
|||
fv->startRenamingSelectedItem();
|
||||
}
|
||||
}
|
||||
// Seraph - Put determineFolderType in here for ensemble typing?
|
||||
}
|
||||
|
||||
void LLInventoryPanel::doToSelected(const LLSD& userdata)
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ void LLPanelMainInventory::toggleFindOptions()
|
|||
finder->openFloater();
|
||||
|
||||
LLFloater* parent_floater = gFloaterView->getParentFloater(this);
|
||||
if (parent_floater) // Seraph: Fix this, shouldn't be null even for sidepanel
|
||||
if (parent_floater)
|
||||
parent_floater->addDependentFloater(mFinderHandle);
|
||||
// start background fetch of folders
|
||||
LLInventoryModelBackgroundFetch::instance().start();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* @file lltexlayerglobalcolor.cpp
|
||||
* @brief SERAPH - ADD IN
|
||||
* @brief Color for texture layers.
|
||||
*
|
||||
* $LicenseInfo:firstyear=2008&license=viewergpl$
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* @file lltexlayerparams.cpp
|
||||
* @brief SERAPH - ADD IN
|
||||
* @brief Texture layer parameters
|
||||
*
|
||||
* $LicenseInfo:firstyear=2002&license=viewergpl$
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue