diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-02 17:08:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-02 17:08:46 -0400 |
| commit | 36634bf50f18038c2a343c786e8b22384a501eae (patch) | |
| tree | 2baa639b76f2b578bac1ac3cc3221ff9326bd04c /indra/newview/llfloatertools.cpp | |
| parent | 9c8fdf5a49145f4147f50c16c4e1775386976798 (diff) | |
| parent | 4f2c25979488733bcf92bc2f6ec357618c3e9632 (diff) | |
merge changes for latest integration changes
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); |