diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4eac7f913a8ef253df70c4fd399001179be6b1a0..133f807cde501c9a5a54eb2aed57c383f6de51c0 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1762,7 +1762,6 @@ if (WINDOWS)
       COMMAND ${PYTHON_EXECUTABLE}
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-        --arch=${ARCH}
         --actions=copy
         --arch=${ARCH}
         --artwork=${ARTWORK_DIR}
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index b329bd21ae4054bf3a04edc67e580a705dfc3ec4..ee87367c16487fb1ea7b99b998fd13fc1d5b54f2 100755
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -438,25 +438,17 @@ void LLPanelPermissions::refresh()
 	const std::string multi_select_string = LLTrans::getString("BuildMultiSelect");
 	if (LineEditorObjectName)
 	{
-		if (is_one_object && keyboard_focus_view != LineEditorObjectName)
+		if (keyboard_focus_view != LineEditorObjectName)
 		{
-			LineEditorObjectName->setValue(nodep->mName);
-		}
-		else
-		{
-			LineEditorObjectName->setValue(multi_select_string);
+			LineEditorObjectName->setValue(is_one_object ? nodep->mName : multi_select_string);
 		}
 	}
 
 	if (LineEditorObjectDesc)
 	{
-		if (is_one_object && keyboard_focus_view != LineEditorObjectDesc)
-		{
-			LineEditorObjectDesc->setText(nodep->mDescription);
-		}
-		else
+		if (keyboard_focus_view != LineEditorObjectDesc)
 		{
-			LineEditorObjectDesc->setText(multi_select_string);
+			LineEditorObjectDesc->setText(is_one_object ? nodep->mDescription : multi_select_string);
 		}
 	}
 	//}