diff options
| author | Vladimir Pchelko <pchelko@productengine.com> | 2010-06-17 17:50:58 +0300 |
|---|---|---|
| committer | Vladimir Pchelko <pchelko@productengine.com> | 2010-06-17 17:50:58 +0300 |
| commit | 9fbb349ec8e50e7e0cb94fa0b97c961360d3767a (patch) | |
| tree | c241866651ec4a80bc2a211c65b04d07e1214568 | |
| parent | d03338ee61c4e6f60b7460a2ad4cead07977c1bd (diff) | |
EXT-7736 FIXED Reverted fix for EXT-2819 (crash in color picker).
Fix description:
Check getParentFloater result.
Note:
ColorsWatch have no parent Floater in EditWearable side-panel.
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index d079da3b36..b83e4fe830 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -338,7 +338,11 @@ void LLColorSwatchCtrl::showPicker(BOOL take_focus) if (!pickerp) { pickerp = new LLFloaterColorPicker(this, mCanApplyImmediately); - //gFloaterView->getParentFloater(this)->addDependentFloater(pickerp); + LLFloater* parent = gFloaterView->getParentFloater(this); + if (parent) + { + parent->addDependentFloater(pickerp); + } mPickerHandle = pickerp->getHandle(); } |