summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelface.cpp3
-rw-r--r--indra/newview/llpanelface.h4
2 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 53e73ac756..dd89efda3e 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1831,7 +1831,7 @@ bool LLPanelFace::selectedMediaEditable()
if ((owner_mask_on & PERM_MODIFY) ||
(group_mask_on & PERM_MODIFY) ||
- (group_mask_on & PERM_MODIFY))
+ (everyone_mask_on & PERM_MODIFY))
{
selected_Media_editable = true;
}
@@ -2405,7 +2405,6 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata)
self->refreshMedia();
}
-// static
void LLPanelFace::updateVisibility()
{
LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 35ac2d161d..0e3ee0ac63 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -260,10 +260,6 @@ private:
//
void updateVisibility();
- // Make material(s) reflect current state of UI (apply edit)
- //
- void updateMaterial();
-
// Hey look everyone, a type-safe alternative to copy and paste! :)
//