diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-18 12:24:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-18 12:24:21 +0100 |
| commit | 333f60ef3cf1a5ac4ce7687faf8369e7d0a4b2de (patch) | |
| tree | edb2169b848d848d834fe6e418c397c10c89a5ff /indra/newview/llcolorswatch.cpp | |
| parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
| parent | 9aa710945685a2cae8cfc622f3dc3d900c1ab4c9 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -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(); } |