From 34d8200d0f0dde1b8205c802edbb08cc1ff503b2 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Sat, 10 Aug 2019 09:01:54 +0300
Subject: DRTVWR-493 LLRender2D init cleanup
---
indra/llui/llui.cpp | 6 ++----
indra/llui/llui.h | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)
(limited to 'indra/llui')
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& );
--
cgit v1.2.3