diff options
| author | angela <angela@lindenlab.com> | 2009-11-09 21:42:28 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-09 21:42:28 +0800 |
| commit | 5d9b0397f0fad861827274dbbe15f2417f08a0db (patch) | |
| tree | 387ea73ff6df1d35a458003f085a22e1a85084a8 | |
| parent | 90d985946ce167a313e2765728caf2652931dfdd (diff) | |
| parent | 8ea12297e2e757ad6efbeaebd3ee86c0605ce385 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 90e48d22ec..c5903eb5ca 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -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)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index baf34b42ff..c8b9841e5d 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -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) { |