diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-06 13:22:22 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-06 13:22:22 -0700 |
| commit | a6b108641489caca1717b98cb888ef2de923f1fc (patch) | |
| tree | afbd1e6a8e5e64357ceb2193e505f6a217d758bd /indra/newview/llinventoryfunctions.cpp | |
| parent | ef735d839317c5d8837c3ce9afd66cb576a2ba94 (diff) | |
| parent | dc6c35e353b991db2651d26bc76e5b3ee9921157 (diff) | |
Merged from viewer-release after resolving conflicts
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 7463658003..2d11337955 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -433,13 +433,12 @@ void show_item_original(const LLUUID& item_uuid) LLPanelMainInventory* main_inventory = floater_inventory->getMainInventoryPanel(); main_inventory->onFilterEdit(""); - } - if(floater_inventory->getVisible()) - { - floater_inventory_visible = true; + if(floater_inventory->getVisible()) + { + floater_inventory_visible = true; + } } - } if(sidepanel_inventory && !floater_inventory_visible) { |