--- lindenuntouched\indra\newview\llviewerjointmesh.cpp	2009-03-18 09:33:22.000000000 +0100
+++ linden\indra\newview\llviewerjointmesh.cpp	2009-03-22 20:18:03.247106000 +0100
@@ -838,9 +838,20 @@
 void LLViewerJointMesh::updateVectorize()
 {
 	sVectorizePerfTest = gSavedSettings.getBOOL("VectorizePerfTest");
-	sVectorizeProcessor = gSavedSettings.getU32("VectorizeProcessor");
 	BOOL vectorizeEnable = gSavedSettings.getBOOL("VectorizeEnable");
 	BOOL vectorizeSkin = gSavedSettings.getBOOL("VectorizeSkin");
+	if (sVectorizePerfTest) {
+		// get CPUInfos to ask hasSSE | hasSSE2 if cpu supports sse|sse2
+		LLCPUInfo CPUInfo;
+		llinfos << "CPU supports SSE " << ( CPUInfo.hasSSE() ? "TRUE" : "FALSE" ) << llendl;
+		llinfos << "CPU supports SSE2 " << ( CPUInfo.hasSSE2() ? "TRUE" : "FALSE" ) << llendl;
+		if (CPUInfo.hasSSE() && CPUInfo.hasSSE2()) { sVectorizeProcessor = 2; }
+		if (CPUInfo.hasSSE() && !sVectorizeProcessor) { sVectorizeProcessor = 1; }
+		if (sVectorizeProcessor != 0) { 
+			vectorizeEnable = 1;
+			vectorizeSkin = 1;
+		}
+	}
 
 	std::string vp;
 	switch(sVectorizeProcessor)
--- linden-untouched\indra\newview\llappviewerwin32.cpp	2009-03-18 09:33:24.000000000 +0100
+++ linden\indra\newview\llappviewerwin32.cpp	2009-03-26 18:52:19.634499800 +0100
@@ -400,61 +400,58 @@
 	// Do driver verification and initialization based on DirectX
 	// hardware polling and driver versions
 	//
-	if (FALSE == gSavedSettings.getBOOL("NoHardwareProbe"))
-	{
-		BOOL vram_only = !gSavedSettings.getBOOL("ProbeHardwareOnStartup");
-
-		// per DEV-11631 - disable hardware probing for everything
-		// but vram.
-		vram_only = TRUE;
-
-		LLSplashScreen::update("Detecting hardware...");
+	BOOL vram_only = !gSavedSettings.getBOOL("ProbeHardwareOnStartup");
 
-		LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
-		gDXHardware.setWriteDebugFunc(write_debug_dx);
-		BOOL probe_ok = gDXHardware.getInfo(vram_only);
-
-		if (!probe_ok
-			&& gSavedSettings.getWarning("AboutDirectX9"))
+	// per DEV-11631 - disable hardware probing for everything
+	// but vram.
+	vram_only = TRUE;
+
+	LLSplashScreen::update("Detecting hardware...");
+
+	LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
+	gDXHardware.setWriteDebugFunc(write_debug_dx);
+	BOOL probe_ok = gDXHardware.getInfo(vram_only);
+
+	if (!probe_ok
+		&& gSavedSettings.getWarning("AboutDirectX9"))
+	{
+		LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
+
+		// Warn them that runnin without DirectX 9 will
+		// not allow us to tell them about driver issues
+		std::ostringstream msg;
+		msg << 
+			LLAppViewer::instance()->getSecondLifeTitle() << " is unable to detect DirectX 9.0b or greater.\n"
+			"\n" <<
+			LLAppViewer::instance()->getSecondLifeTitle() << " uses DirectX to detect hardware and/or\n"
+			"outdated drivers that can cause stability problems,\n"
+			"poor performance and crashes.  While you can run\n" <<
+			LLAppViewer::instance()->getSecondLifeTitle() << " without it, we highly recommend running\n"
+			"with DirectX 9.0b\n"
+			"\n"
+			"Do you wish to continue?\n";
+		S32 button = OSMessageBox(
+			msg.str(),
+			"Warning",
+			OSMB_YESNO);
+		if (OSBTN_NO== button)
 		{
-			LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
-
-			// Warn them that runnin without DirectX 9 will
-			// not allow us to tell them about driver issues
-			std::ostringstream msg;
-			msg << 
-				LLAppViewer::instance()->getSecondLifeTitle() << " is unable to detect DirectX 9.0b or greater.\n"
-				"\n" <<
-				LLAppViewer::instance()->getSecondLifeTitle() << " uses DirectX to detect hardware and/or\n"
-				"outdated drivers that can cause stability problems,\n"
-				"poor performance and crashes.  While you can run\n" <<
-				LLAppViewer::instance()->getSecondLifeTitle() << " without it, we highly recommend running\n"
-				"with DirectX 9.0b\n"
-				"\n"
-				"Do you wish to continue?\n";
-			S32 button = OSMessageBox(
-				msg.str(),
-				"Warning",
-				OSMB_YESNO);
-			if (OSBTN_NO== button)
-			{
-				LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL;
-				LLWeb::loadURLExternal(DIRECTX_9_URL);
-				return false;
-			}
-			gSavedSettings.setWarning("AboutDirectX9", FALSE);
+			LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL;
+			LLWeb::loadURLExternal(DIRECTX_9_URL);
+			return false;
 		}
-		LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
+		gSavedSettings.setWarning("AboutDirectX9", FALSE);
+	}
+	LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
 
-		// Only probe once after installation
-		gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
+	// Only probe once after installation
+	gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
 
-		// Disable so debugger can work
-		std::ostringstream splash_msg;
-		splash_msg << "Loading " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
+	// Disable so debugger can work
+	std::ostringstream splash_msg;
+	splash_msg << "Loading " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
 
-		LLSplashScreen::update(splash_msg.str());
-	}
+	LLSplashScreen::update(splash_msg.str());
 
 	if (!restoreErrorTrap())
 	{

--- lindenuntouched\indra\llrender\llgl.cpp	2009-03-18 09:33:22.000000000 +0100
+++ linden\indra\llrender\llgl.cpp	2009-03-22 20:19:24.369106000 +0100
@@ -109,10 +109,6 @@
 PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB = NULL;
 PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB = NULL;
 
-// GL_ARB_point_parameters
-PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB = NULL;
-PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB = NULL;
-
 // GL_EXT_framebuffer_object
 PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT = NULL;
 PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT = NULL;
@@ -244,10 +240,6 @@
 PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB = NULL;
 PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB = NULL;
 
-#if LL_WINDOWS
-PFNWGLSWAPINTERVALEXTPROC			wglSwapIntervalEXT = NULL;
-#endif
-
 #if LL_LINUX
 PFNGLCOLORTABLEEXTPROC glColorTableEXT = NULL;
 #endif // LL_LINUX
@@ -588,7 +580,7 @@
 	mHasFramebufferObject = ExtensionExists("GL_EXT_framebuffer_object", gGLHExts.mSysExts)
 		&& ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
 #if !LL_DARWIN
-	mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
+	mHasPointParameters = ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
 	mHasShaderObjects = ExtensionExists("GL_ARB_shader_objects", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
 	mHasVertexShader = ExtensionExists("GL_ARB_vertex_program", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_vertex_shader", gGLHExts.mSysExts)
@@ -711,8 +703,8 @@
 	}
 	if (mIsATI && mHasMipMapGeneration)
 	{
-		LL_INFOS("RenderInit") << "Disabling mip-map generation for ATI GPUs (performance opt)" << LL_ENDL;
-		mHasMipMapGeneration = FALSE;
+		LL_INFOS("RenderInit") << "__NOT__ Disabling mip-map generation for ATI GPUs (performance opt)" << LL_ENDL;
+		//mHasMipMapGeneration = FALSE;
 	}
 	
 	// Misc
--- linden-untouched\doc\contributions.txt	2009-03-18 09:33:24.000000000 +0100
+++ linden\doc\contributions.txt	2009-03-26 19:09:37.752499800 +0100
@@ -208,6 +208,8 @@
 Kunnis Basiat
 	VWR-82
 	VWR-102
+Luricos Alderton
+	VWR-12540	
 maciek marksman
 	CT-86
 march Korda
@@ -344,6 +346,7 @@
 	VWR-287
 Sammy Frederix
 	VWR-6186
+	VWR-12155
 Scrippy Scofield
 	VWR-3748
 Seg Baphomet