Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml

indra/newview/llpanelface.cpp

@@ -516,7 +516,7 @@ void LLPanelFace::getState()
 		&& objectp->getPCode() == LL_PCODE_VOLUME
 		&& objectp->permModify())
 	{
-		BOOL editable = objectp->permModify();
+		BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
 
 
 		// only turn on auto-adjust button if there is a media renderer and the media is loaded