diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 10:21:52 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 10:21:52 -0700 |
| commit | c8970618567e867b619c9fb5e225978bc5f66781 (patch) | |
| tree | d5ec9d2f27d887e9a39b1109469ca405b14c6a85 /indra/newview/llpanelmaininventory.cpp | |
| parent | 6be9f280ff5b2e2eba3bb9c3f14d7166579d1a49 (diff) | |
| parent | a069e0d3db0e0771e54768a702fa18e57415992e (diff) | |
Merge with q/viewer-release
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(); |