diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
| commit | 419bfb16fdd9b79d32736fd80652685a07f9e39f (patch) | |
| tree | 4afafc0665ca3b486e2507369d9d214d40abf9ac /indra/newview/llinventoryfunctions.cpp | |
| parent | ced040f8aef5a764c2e6fb261d5bbecd4df75064 (diff) | |
| parent | 7de36b3d4217f5ceee8b46a59983229b7af35981 (diff) | |
automated merge
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) { |