diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
| commit | d4462963c6ba5db2088723bbedc7b60f1184c594 (patch) | |
| tree | 34aaba4b31f93388b0ce3b2b36e9c49823bec2cf /indra/newview/llinventorymodel.cpp | |
| parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) | |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 90455f5902..2a686c46b9 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2356,7 +2356,7 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo if(!gInventory.isObjectDescendentOf(lastitem->getUUID(), trash_id)) { LLMultiPreview* multi_previewp = LLMultiPreview::getAutoOpenInstance(folder_id); - if (!multi_previewp && all_one_folder) + if (!multi_previewp && all_one_folder && count > 1) { S32 left, top; gFloaterView->getNewFloaterPosition(&left, &top); |