diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-16 15:25:40 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-16 15:25:40 +0300 |
| commit | 9cb1fcec6d52933f01426aec4e6a3f1b6774632c (patch) | |
| tree | ac6b0a5ddb280db610162dece01166905d46b60e /indra/newview/llpanelmaininventory.cpp | |
| parent | b9a468aff6b4b9bdaf4ac0ab2a309902c6c203ed (diff) | |
| parent | 9ee5a62332353db6a098628e69732d2723cc5deb (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 54d1b46016..9eece81861 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -604,7 +604,7 @@ void LLPanelMainInventory::toggleFindOptions() finder->openFloater(); LLFloater* parent_floater = gFloaterView->getParentFloater(this); - if (parent_floater) // Seraph: Fix this, shouldn't be null even for sidepanel + if (parent_floater) parent_floater->addDependentFloater(mFinderHandle); // start background fetch of folders LLInventoryModelBackgroundFetch::instance().start(); |