diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
| commit | a6c20ae524610de2f8681cff8353d062a69b923e (patch) | |
| tree | 929e4a253e4b83ca7e07543916e709d50fdf855e /indra/newview/llfloatertools.cpp | |
| parent | 6c13c4dd552a05cf055a90bdd90937de9f3903a5 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
merging
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); |