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

Tweaks to fix the channel stuff, save a bit of processing.

Browse Source 
A few options I missed with the last commit, and some minor patching because it's in the same file.
This commit is contained in:
Beeks
2010-09-24 20:13:07 -04:00
parent f8c2308c87
commit 4bf3859c09
7 changed files with 42 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llinventorymodel.cpp
View File

@@ -1516,7 +1516,7 @@ void LLInventoryModel::bulkFetch(std::string url)
if (cat)
{
// <edit> Pre-emptive strike
if(!(gInventory.isObjectDescendentOf(cat->getUUID(), gLocalInventoryRoot)))
if(!(gInventory.isObjectDescendentOf(cat->getUUID(), gSystemFolderRoot)))
{
// </edit>
if ( LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
@@ -2047,7 +2047,7 @@ bool LLInventoryModel::isCategoryComplete(const LLUUID& cat_id) const
}
// <edit>
if((cat_id == gLocalInventoryRoot) || gInventory.isObjectDescendentOf(cat_id, gLocalInventoryRoot)) return true;
if((cat_id == gSystemFolderRoot) || gInventory.isObjectDescendentOf(cat_id, gSystemFolderRoot)) return true;
// </edit>
return false;
@@ -3382,14 +3382,6 @@ void LLInventoryModel::processSaveAssetIntoInventory(LLMessageSystem* msg,
}
}
struct InventoryCallbackInfo
{
InventoryCallbackInfo(U32 callback, const LLUUID& inv_id) :