diff --git a/.gitignore b/.gitignore
index f30ca2cc4..4f9405a16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@
 /edited-files.txt
 qtcreator-build/
 /.pc
+/build-*
+/viewer-*
diff --git a/indra/llwindow/glh/glh_linear.h b/indra/llwindow/glh/glh_linear.h
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/install_icon_singularity.BMP b/indra/newview/installers/windows/install_icon_singularity.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/uninstall_icon_singularity.BMP b/indra/newview/installers/windows/uninstall_icon_singularity.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/uninstall_icon_singularity.ico b/indra/newview/installers/windows/uninstall_icon_singularity.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 7f6bf3a62..ae5dcdc45 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2430,7 +2430,9 @@ void LLFloaterIMPanel::processIMTyping(const LLIMInfo* im_info, BOOL typing)
 	if (typing)
 	{
 		// other user started typing
-		addTypingIndicator(im_info->mName);
+		std::string name;
+		if (!LLAvatarNameCache::getPNSName(im_info->mFromID, name)) name = im_info->mName;
+		addTypingIndicator(name);
 	}
 	else
 	{
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 92c71d8bb..80bb82a65 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -360,6 +360,13 @@ void LLPanelAvatarSecondLife::enableControls(BOOL self)
 {
 	childSetEnabled("img", self);
 	childSetEnabled("about", self);
+	if (self) // We can't give inventory to self
+	{
+		if (LLDropTarget* drop_target = findChild<LLDropTarget>("drop_target_rect"))
+			removeChild(drop_target);
+		if (LLTextBox* text_box = findChild<LLTextBox>("Give item:"))
+			removeChild(text_box);
+	}
 	childSetVisible("allow_publish", self);
 	childSetEnabled("allow_publish", self);
 	childSetVisible("?", self);
diff --git a/indra/newview/res/singularity_icon.ico b/indra/newview/res/singularity_icon.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/silver/textures/preview.png b/indra/newview/skins/silver/textures/preview.png
old mode 100755
new mode 100644
diff --git a/indra/plugins/base_basic/basic_plugin_base.cpp b/indra/plugins/base_basic/basic_plugin_base.cpp
old mode 100755
new mode 100644
diff --git a/indra/plugins/base_basic/basic_plugin_base.h b/indra/plugins/base_basic/basic_plugin_base.h
old mode 100755
new mode 100644
diff --git a/indra/plugins/base_media/media_plugin_base.cpp b/indra/plugins/base_media/media_plugin_base.cpp
old mode 100755
new mode 100644
diff --git a/indra/plugins/base_media/media_plugin_base.exp b/indra/plugins/base_media/media_plugin_base.exp
old mode 100755
new mode 100644
diff --git a/indra/plugins/base_media/media_plugin_base.h b/indra/plugins/base_media/media_plugin_base.h
old mode 100755
new mode 100644
diff --git a/indra/plugins/example_media/media_plugin_example.cpp b/indra/plugins/example_media/media_plugin_example.cpp
old mode 100755
new mode 100644
diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamer.h b/indra/plugins/gstreamer010/llmediaimplgstreamer.h
old mode 100755
new mode 100644
diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
old mode 100755
new mode 100644
diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
old mode 100755
new mode 100644
diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.h b/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.h
old mode 100755
new mode 100644
diff --git a/indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp
old mode 100755
new mode 100644
diff --git a/indra/plugins/quicktime/CMakeLists.txt b/indra/plugins/quicktime/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/plugins/quicktime/media_plugin_quicktime.cpp b/indra/plugins/quicktime/media_plugin_quicktime.cpp
old mode 100755
new mode 100644