escape from infinitive loop of fetching inventory folder with NULL uuid
parent
73b1e2bf47
commit
8ea12297e2
|
|
@ -2127,6 +2127,7 @@ void LLFolderBridge::openItem()
|
|||
lldebugs << "LLFolderBridge::openItem()" << llendl;
|
||||
LLInventoryModel* model = getInventoryModel();
|
||||
if(!model) return;
|
||||
if(mUUID.isNull()) return;
|
||||
bool fetching_inventory = model->fetchDescendentsOf(mUUID);
|
||||
// Only change folder type if we have the folder contents.
|
||||
if (!fetching_inventory)
|
||||
|
|
|
|||
|
|
@ -1267,6 +1267,8 @@ void LLInventoryModel::fetchInventoryResponder::error(U32 status, const std::str
|
|||
|
||||
bool LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id)
|
||||
{
|
||||
if(folder_id.isNull()) return false;
|
||||
|
||||
LLViewerInventoryCategory* cat = getCategory(folder_id);
|
||||
if(!cat)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue