diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-06 15:28:31 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-06 15:28:31 +0300 |
| commit | 6eef4d70d7b53216bc2e7e463bf9108447de9d55 (patch) | |
| tree | c692881e840069b3932579ca91448f79b54d5b43 /indra/newview/llinventoryfunctions.cpp | |
| parent | f92e50c54246add3afc752f86f072b23bdb2e5ad (diff) | |
| parent | a1bbba2be64daf332bdf511129b1ec4f2bea1540 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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) { |