Skip to content
Snippets Groups Projects
Commit 9fbb349e authored by Vladimir Pchelko's avatar Vladimir Pchelko
Browse files

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
parent d03338ee
Branches
Tags
No related merge requests found
...@@ -338,7 +338,11 @@ void LLColorSwatchCtrl::showPicker(BOOL take_focus) ...@@ -338,7 +338,11 @@ void LLColorSwatchCtrl::showPicker(BOOL take_focus)
if (!pickerp) if (!pickerp)
{ {
pickerp = new LLFloaterColorPicker(this, mCanApplyImmediately); pickerp = new LLFloaterColorPicker(this, mCanApplyImmediately);
//gFloaterView->getParentFloater(this)->addDependentFloater(pickerp); LLFloater* parent = gFloaterView->getParentFloater(this);
if (parent)
{
parent->addDependentFloater(pickerp);
}
mPickerHandle = pickerp->getHandle(); mPickerHandle = pickerp->getHandle();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment