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

Removed some old rlva code that was breaking serverside baking. Also merge some other minor inventory/appearance related changes from v3.

Browse Source
This commit is contained in:
Shyotl
2016-06-15 00:02:18 -05:00
parent f47395531f
commit 2065e45011
3 changed files with 96 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorymodel.cpp
View File

@@ -1118,7 +1118,7 @@ LLInventoryModel::item_array_t* LLInventoryModel::getUnlockedItemArray(const LLU
// an existing item with the matching id, or it will add the category.
void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat, U32 mask)
{
if(cat->getUUID().isNull())
if(!cat || cat->getUUID().isNull())
{
return;
}
@@ -1175,8 +1175,8 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat, U32
}
// make space in the tree for this category's children.
llassert_always(mCategoryLock[LLUUID(new_cat->getUUID())] == false);
llassert_always(mItemLock[LLUUID(new_cat->getUUID())] == false);
llassert_always(mCategoryLock[new_cat->getUUID()] == false);
llassert_always(mItemLock[new_cat->getUUID()] == false);
cat_array_t* catsp = new cat_array_t;
item_array_t* itemsp = new item_array_t;
mParentChildCategoryTree[new_cat->getUUID()] = catsp;