Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge llfloatertools.cpp with upstream to fix MATBUG-240

Browse Source 
MATBUG-240: Unable to change media settings for an already applied media texture unless media texture is removed and reapplied.
This commit is contained in:
Inusaito Sayori
2013-11-22 17:35:11 -05:00
parent f3f1727b49
commit 209e64b136
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloatertools.cpp
View File

@@ -1313,7 +1313,7 @@ void LLFloaterTools::getMediaState()
getChildView("media_tex")->setEnabled(bool_has_media && editable); getChildView("media_tex")->setEnabled(bool_has_media && editable);
getChildView("edit_media")->setEnabled(bool_has_media && LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo && editable ); getChildView("edit_media")->setEnabled(bool_has_media && LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo && editable );
getChildView("delete_media")->setEnabled(bool_has_media && 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 // TODO: display a list of all media on the face - use 'identical' flag
} }
else // not all face has media but at least one does. else // not all face has media but at least one does.
@@ -1343,7 +1343,7 @@ void LLFloaterTools::getMediaState()
getChildView("media_tex")->setEnabled(TRUE); getChildView("media_tex")->setEnabled(TRUE);
getChildView("edit_media")->setEnabled(LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo); getChildView("edit_media")->setEnabled(LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo);
getChildView("delete_media")->setEnabled(TRUE); getChildView("delete_media")->setEnabled(TRUE);
getChildView("add_media")->setEnabled(FALSE ); getChildView("add_media")->setEnabled(editable);
} }
media_info->setText(media_title); media_info->setText(media_title);
@@ -1353,6 +1353,8 @@ void LLFloaterTools::getMediaState()
if(mTitleMedia) if(mTitleMedia)
LLFloaterMediaSettings::initValues(mMediaSettings, editable ); LLFloaterMediaSettings::initValues(mMediaSettings, editable );
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// called when a user wants to add media to a prim or prim face // called when a user wants to add media to a prim or prim face
void LLFloaterTools::onClickBtnAddMedia() void LLFloaterTools::onClickBtnAddMedia()