diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 6bad4a726..3d78e6751 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -40,3 +40,11 @@ link_directories(
     ${VORBISFILE_LIBRARY_DIRS}
     ${OGG_LIBRARY_DIRS}
     )
+
+set(LLAUDIO_VORBIS_LIBRARIES
+    ${VORBISENC_LIBRARIES}
+    ${VORBISFILE_LIBRARIES}
+    ${VORBIS_LIBRARIES}
+    ${OGG_LIBRARIES}
+    )
+
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 61c383c0d..bd14fa548 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -111,10 +111,4 @@ list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
 
 add_library (llaudio ${llaudio_SOURCE_FILES})
 add_dependencies(llaudio prepare)
-target_link_libraries(
-    llaudio
-    ${VORBISENC_LIBRARIES}
-    ${VORBISFILE_LIBRARIES}
-    ${VORBIS_LIBRARIES}
-    ${OGG_LIBRARIES}
-    )
+
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index fcede5363..a120b5d32 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -717,8 +717,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		}
 		else if (major_version > 1 || minor_version >= 30)
 		{  //switches are supported in GLSL 1.30 and later
-			if (gGLManager.mIsNVIDIA)
-			{ //switches are unreliable on some NVIDIA drivers
+			if (gGLManager.mIsNVIDIA || (gGLManager.mIsATI && gGLManager.mGLVersion < 3.3f))
+			{ //switches are unreliable on old drivers
 				for (S32 i = 0; i < texture_index_channels; ++i)
 				{
 					std::string if_string = llformat("\t%sif (vary_texture_index == %d) { return texture2D(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i); 
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index 377c9a12b..07b811f71 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -88,6 +88,7 @@ LLMultiFloater::LLMultiFloater(
 	{
 		mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
 	}
+	mTabContainer->setCommitCallback(boost::bind(&LLMultiFloater::onTabSelected, this));
 
 	addChild(mTabContainer);
 }
@@ -114,6 +115,7 @@ LLMultiFloater::LLMultiFloater(
 	{
 		mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
 	}
+	mTabContainer->setCommitCallback(boost::bind(&LLMultiFloater::onTabSelected, this));
 
 	addChild(mTabContainer);
 	
@@ -482,7 +484,7 @@ void LLMultiFloater::setCanResize(BOOL can_resize)
 	}
 }
 
-BOOL LLMultiFloater::postBuild()
+/*BOOL LLMultiFloater::postBuild()
 {
 	// remember any original xml minimum size
 	getResizeLimits(&mOrigMinWidth, &mOrigMinHeight);
@@ -501,7 +503,7 @@ BOOL LLMultiFloater::postBuild()
 	}
 
 	return FALSE;
-}
+}*/
 
 void LLMultiFloater::updateResizeLimits()
 {
diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h
index 0ac9ee856..e56b387bc 100644
--- a/indra/llui/llmultifloater.h
+++ b/indra/llui/llmultifloater.h
@@ -45,7 +45,6 @@ public:
 	LLMultiFloater(const std::string& name, const std::string& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
 	virtual ~LLMultiFloater() {};
 
-	virtual BOOL postBuild();
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	/*virtual*/ void open();	/* Flawfinder: ignore */
 	/*virtual*/ void onClose(bool app_quitting);
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0ee9545e3..e1742fc20 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1540,6 +1540,7 @@ endif (WINDOWS)
 target_link_libraries(${VIEWER_BINARY_NAME}
     ${GOOGLE_PERFTOOLS_LIBRARIES}
     ${LLAUDIO_LIBRARIES}
+    ${LLAUDIO_VORBIS_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
     ${LLIMAGEJ2COJ_LIBRARIES}
diff --git a/indra/newview/app_settings/default_grids.xml b/indra/newview/app_settings/default_grids.xml
index a909642b8..b86d64ac3 100755
--- a/indra/newview/app_settings/default_grids.xml
+++ b/indra/newview/app_settings/default_grids.xml
@@ -2,7 +2,7 @@
   <array>
 
     <map>
-      <key>default_grids_version</key><string>20</string>
+      <key>default_grids_version</key><string>21</string>
     </map>
 
     <!-- Second Life -->
@@ -38,6 +38,23 @@
       <key>auto_update</key><boolean>0</boolean>
     </map>
 
+    <!-- OSGrid -->
+    <map>
+      <key>auto_update</key> <boolean>0</boolean>
+      <key>gridname</key> <string>OSGrid</string>
+      <key>gridnick</key> <string>osgrid</string>
+      <key>helperuri</key> <string>http://helper.osgrid.org/</string>
+      <key>inventory_links</key> <boolean>0</boolean>
+      <key>loginpage</key> <string>http://www.osgrid.org/splash/</string>
+      <key>loginuri</key> <string>http://login.osgrid.org/</string>
+      <key>password</key> <string>http://www.osgrid.org/</string>
+      <key>platform</key> <string>OpenSim</string>
+      <key>register</key> <string>http://www.osgrid.org/</string>
+      <key>render_compat</key> <boolean>1</boolean>
+      <key>search</key> <string />
+      <key>support</key> <string>http://www.osgrid.org/</string>
+      <key>website</key> <string>http://www.osgrid.org/</string>
+    </map>
 
     <!-- Local Host -->
     <map>
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index aa6905f2b..c8b3a4b1f 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -563,6 +563,7 @@ void LLMultiPreview::open()		/*Flawfinder: ignore*/
 	{
 		frontmost_preview->loadAsset();
 	}
+	LLMultiFloater::postBuild();
 }
 
 
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4463e4062..29d6b24f3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3510,8 +3510,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 				continue;
 			}
 
-			if ((vobj->isMesh() &&
-				(vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled()))
+			if (vobj->isMesh() &&
+					((vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled()))
 			{
 				continue;
 			}
diff --git a/install.xml b/install.xml
index dd94fa71c..1434b9cd0 100644
--- a/install.xml
+++ b/install.xml
@@ -587,9 +587,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>4f787437a5e063ccde6637dfb1ebc01d</string>
+            <string>82b85cce650e7409fc165bc730e2ad7a</string>
             <key>url</key>
-            <uri>https://www.avination.com/viewerfiles/google_perftools-1.8-windows-20111005.tar.bz2</uri>
+            <uri>https://github.com/downloads/siana/SingularityViewer/gperftools-2.0-svn-windows-20120830.tar.bz2</uri>
           </map>
         </map>
       </map>