diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-12 20:35:27 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-12 20:35:27 +0300 |
| commit | b6a3901c2fd9a2866625f63b4b09a50d727cca34 (patch) | |
| tree | 5aa88188c4bcfd085e82fdefc5b351e175d2748b /indra/llui | |
| parent | d6030c7376b930d0bfc40c29ec9888e3db851c06 (diff) | |
| parent | 98be6e141c1232bad28cc115bc7092f175b18809 (diff) | |
Merge from nat_linden/drtvwr-493
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 9decaf92cb..e1c51deba9 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -115,7 +115,7 @@ public: typedef std::map<std::string, LLControlGroup*> settings_map_t; private: - LLPARAMSINGLETON(LLUI , const settings_map_t &settings, + LLSINGLETON(LLUI , const settings_map_t &settings, LLImageProviderInterface* image_provider, LLUIAudioCallback audio_callback, LLUIAudioCallback deferred_audio_callback); |