livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
meow-7.2.2
Vladimir Pchelko 2010-06-17 17:50:58 +03:00
parent d03338ee61
commit 9fbb349ec8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llcolorswatch.cpp
View File

@ -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();
}