4 files changed, 6 insertions, 11 deletions
diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index 1a7c4144ed..0467321e3b 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -1565,10 +1565,9 @@ void gl_segmented_rect_3d_tex(const LLRectf& clip_rect, const LLRectf& center_uv
 
 }
 
-LLRender2D::LLRender2D(LLImageProviderInterface* image_provider,
-						   const LLVector2* scale_factor)
+LLRender2D::LLRender2D(LLImageProviderInterface* image_provider)
 {
-	mGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor;
+	mGLScaleFactor = LLVector2(1.f, 1.f);
 	mImageProvider = image_provider;
 }
 
diff --git a/indra/llrender/llrender2dutils.h b/indra/llrender/llrender2dutils.h
index 4e4696be41..f2640ff998 100644
--- a/indra/llrender/llrender2dutils.h
+++ b/indra/llrender/llrender2dutils.h
@@ -123,7 +123,7 @@ class LLImageProviderInterface;
 
 class LLRender2D : public LLParamSingleton<LLRender2D>
 {
-	LLPARAMSINGLETON(LLRender2D, LLImageProviderInterface* image_provider, const LLVector2* scale_factor);
+	LLPARAMSINGLETON(LLRender2D, LLImageProviderInterface* image_provider);
 	LOG_CLASS(LLRender2D);
 	~LLRender2D();
 public:
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 2e2833c197..b5c4ca1d9f 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -160,11 +160,9 @@ void make_ui_sound_deferred(const char* namep)
 void LLUI::initClass(const settings_map_t& settings,
 					 LLImageProviderInterface* image_provider,
 					 LLUIAudioCallback audio_callback,
-					 LLUIAudioCallback deferred_audio_callback,
-					 const LLVector2* scale_factor,
-					 const std::string& language)
+					 LLUIAudioCallback deferred_audio_callback)
 {
-	LLRender2D::initParamSingleton(image_provider,scale_factor);
+	LLRender2D::initParamSingleton(image_provider);
 	sSettingGroups = settings;
 
 	if ((get_ptr_in_map(sSettingGroups, std::string("config")) == NULL) ||
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index c6ee11a96e..ad32b093aa 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -240,9 +240,7 @@ public:
 	static void initClass(const settings_map_t& settings,
 						  LLImageProviderInterface* image_provider,
 						  LLUIAudioCallback audio_callback = NULL,
-						  LLUIAudioCallback deferred_audio_callback = NULL,
-						  const LLVector2 *scale_factor = NULL,
-						  const std::string& language = LLStringUtil::null);
+						  LLUIAudioCallback deferred_audio_callback = NULL);
 
 	static void setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t&, const clear_popups_t& );