Removed some TOS/TPVp violations that we missed in the last sweep

Fix for the client definitions - Emerald's color is corrected, Emergence now reports properly.
Fixed the error "Client crashes if preferences is opened on login screen"

Signed-off-by: Beeks <HgDelirium@gmail.com>

indra/newview/llpanelface.cpp

@@ -383,15 +383,10 @@ void LLPanelFace::getState()
 
 	if( objectp
 		&& objectp->getPCode() == LL_PCODE_VOLUME
-		// <edit>
-		//&& objectp->permModify())
-		)
-		// </edit>
-	{
-		// <edit>
-		//BOOL editable = objectp->permModify();
-		BOOL editable = TRUE;
-		// </edit>
+		&& objectp->permModify())
+	{
+		BOOL editable = objectp->permModify();
+
 
 		// only turn on auto-adjust button if there is a media renderer and the media is loaded
 		childSetEnabled("textbox autofix",FALSE);