livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-493 LLRender2D init cleanup

master
andreykproductengine 2019-08-10 09:01:54 +03:00
parent c2660070ce
commit 34d8200d0f
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llrender/llrender2dutils.cpp
View File

@ -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;
}

2
indra/llrender/llrender2dutils.h
View File

@ -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:

6
indra/llui/llui.cpp
View File

@ -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) ||

4
indra/llui/llui.h
View File

@ -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& );