diff options
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 353e93c549..0a0e0e164e 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -54,6 +54,7 @@ class LLView; class LLHelp; void make_ui_sound(const char* name); +void make_ui_sound_deferred(const char * name); class LLImageProviderInterface; @@ -190,6 +191,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); static void cleanupClass(); @@ -278,6 +280,7 @@ public: // static settings_map_t sSettingGroups; static LLUIAudioCallback sAudioCallback; + static LLUIAudioCallback sDeferredAudioCallback; static LLWindow* sWindow; static LLView* sRootView; static LLHelp* sHelpImpl; @@ -340,12 +343,11 @@ public: // this avoids a MSVC bug where non-referenced static members are "optimized" away // even if their constructors have side effects - void reference() + S32 reference() { -#ifdef LL_WINDOWS S32 dummy; dummy = 0; -#endif /*LL_WINDOWS*/ + return dummy; } }; @@ -413,7 +415,7 @@ public: namespace LLInitParam { template<> - class ParamValue<LLRect, TypeValues<LLRect> > + class ParamValue<LLRect> : public CustomParamValue<LLRect> { typedef CustomParamValue<LLRect> super_t; @@ -432,7 +434,7 @@ namespace LLInitParam }; template<> - class ParamValue<LLUIColor, TypeValues<LLUIColor> > + class ParamValue<LLUIColor> : public CustomParamValue<LLUIColor> { typedef CustomParamValue<LLUIColor> super_t; @@ -450,7 +452,7 @@ namespace LLInitParam }; template<> - class ParamValue<const LLFontGL*, TypeValues<const LLFontGL*> > + class ParamValue<const LLFontGL*> : public CustomParamValue<const LLFontGL* > { typedef CustomParamValue<const LLFontGL*> super_t; @@ -490,7 +492,7 @@ namespace LLInitParam template<> - class ParamValue<LLCoordGL, TypeValues<LLCoordGL> > + class ParamValue<LLCoordGL> : public CustomParamValue<LLCoordGL> { typedef CustomParamValue<LLCoordGL> super_t; |