From 9fbb349ec8e50e7e0cb94fa0b97c961360d3767a Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 17 Jun 2010 17:50:58 +0300
Subject: [PATCH] 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
---
indra/newview/llcolorswatch.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index d079da3b360..b83e4fe830d 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();
}
--
GitLab