diff options
| author | angela <angela@lindenlab.com> | 2009-11-10 12:15:42 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-10 12:15:42 +0800 |
| commit | ae27a93395ef01535e03e02ec9fa5e221ce58e23 (patch) | |
| tree | 0529dc96ad0f1ed9513652aad18e9702d676b772 /indra/newview/llinventorybridge.cpp | |
| parent | 5662a8d126b3dab1100aab014aeaeb1752dba26a (diff) | |
| parent | 6106c9a7dadcf0ba4a33ad1ee826ccd31909b893 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 84e0f58c4b..1bc9297bba 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2130,6 +2130,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)
|