diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
| commit | d9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch) | |
| tree | 39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/newview/llfloatertools.cpp | |
| parent | c8144f7405178621f779b814fd4cb3e632786e0a (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge with 3.6.6-release
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rwxr-xr-x | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 14923eec3c..7b25291da7 100755 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1328,7 +1328,7 @@ void LLFloaterTools::getMediaState() getChildView("media_tex")->setEnabled(bool_has_media && editable); getChildView("edit_media")->setEnabled(bool_has_media && LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo && editable ); getChildView("delete_media")->setEnabled(bool_has_media && editable ); - getChildView("add_media")->setEnabled(( ! bool_has_media ) && editable ); + getChildView("add_media")->setEnabled(editable); // TODO: display a list of all media on the face - use 'identical' flag } else // not all face has media but at least one does. @@ -1358,7 +1358,7 @@ void LLFloaterTools::getMediaState() getChildView("media_tex")->setEnabled(TRUE); getChildView("edit_media")->setEnabled(LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo); getChildView("delete_media")->setEnabled(TRUE); - getChildView("add_media")->setEnabled(FALSE ); + getChildView("add_media")->setEnabled(editable); } media_info->setText(media_title); |