Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More stuff migrated to llinventoryfunctions.cpp

Browse Source
This commit is contained in:
Shyotl
2012-01-13 21:05:53 -06:00
parent 860bddb1f5
commit f0f2834cfe
9 changed files with 289 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/rlvinventory.cpp
View File

@@ -18,6 +18,7 @@
#include "llagent.h"
#include "llcallbacklist.h"
#include "llstartup.h"
#include "llviewerfoldertype.h"
#include "llviewerobject.h"
#include "llvoavatar.h"
@@ -29,9 +30,6 @@
#include "boost/algorithm/string.hpp"
// Only defined in llinventorymodel.cpp
extern const char* NEW_CATEGORY_NAME;
// ============================================================================
// Static variable initialization
//
@@ -394,6 +392,7 @@ void RlvRenameOnWearObserver::doneIdle()
continue;
}
static const std::string &new_category_name = LLViewerFolderType::lookupNewCategoryName(LLFolderType::FT_NONE);
for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
{
LLViewerInventoryItem* pItem = items.get(idxItem);
@@ -428,7 +427,7 @@ void RlvRenameOnWearObserver::doneIdle()
std::string strFolderName = ".(" + strAttachPt + ")";
// Rename the item's parent folder if it's called "New Folder", isn't directly under #RLV and contains exactly 1 object
if ( (NEW_CATEGORY_NAME == pFolder->getName()) &&
if ( (new_category_name == pFolder->getName()) &&
(pFolder->getParentUUID() != pRlvRoot->getUUID()) &&
(1 == RlvInventory::getDirectDescendentsCount(pFolder, LLAssetType::AT_OBJECT)) )
{