diff -r 848ad0e546f8 -r f1bb8f34ccdc doc/contributions.txt
--- a/doc/contributions.txt	Thu Jul 16 17:54:58 2009 +0000
+++ b/doc/contributions.txt	Mon Jun 20 15:16:27 2011 +0200
@@ -125,6 +125,7 @@
 	VWR-17
 Boroondas Gupte
 	VWR-233
+	VWR-26066
 	WEB-262
 Bulli Schumann
 	CT-218
diff -r 848ad0e546f8 -r f1bb8f34ccdc indra/newview/llfloaterworldmap.cpp
--- a/indra/newview/llfloaterworldmap.cpp	Thu Jul 16 17:54:58 2009 +0000
+++ b/indra/newview/llfloaterworldmap.cpp	Mon Jun 20 15:16:27 2011 +0200
@@ -67,7 +67,7 @@
 #include "llappviewer.h"
 #include "llmapimagetype.h"
 #include "llweb.h"
-#include "llslider.h"
+#include "llsliderctrl.h"
 
 #include "llglheaders.h"
 #include "llwindow.h"			// copyTextToClipboard()
@@ -974,7 +974,7 @@
 
 	F32 min_power = log(pixels_per_region/256.f)/log(2.f);
 	
-	getChild<LLSlider>("zoom slider")->setMinValue(min_power);
+	getChild<LLSliderCtrl>("zoom slider")->setMinValue(min_power);
 }