escape from infinitive loop of fetching inventory folder with NULL uuid

meow-7.2.2
angela 2009-11-09 13:34:32 +08:00
parent 73b1e2bf47
commit 8ea12297e2
2 changed files with 3 additions and 0 deletions

View File

@ -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)

View File

@ -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)
{