Commits

Anonymous committed 76dfa3d

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.

Comments (0)

Files changed (1)

indra/newview/llcolorswatch.cpp

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