diff options
| author | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
| commit | a7e6dc088fcd3d70dd74f0eef3c120ecd9296913 (patch) | |
| tree | 09d1c90cf506793326ff7d75e9f5d2833d1b0a72 /indra/llui/llui.h | |
| parent | 4f0237007a3a21cc502a1a15b0530bceaf5217db (diff) | |
| parent | edb5be4ec0a88931933a27dc7e94d45ea249591d (diff) | |
merging latest changes
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index e54cae1d78..4c1703392a 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -62,6 +62,7 @@ class LLHelp; // UI colors extern const LLColor4 UI_VERTEX_COLOR; void make_ui_sound(const char* name); +void make_ui_sound_deferred(const char * name); BOOL ui_point_in_rect(S32 x, S32 y, S32 left, S32 top, S32 right, S32 bottom); void gl_state_for_2d(S32 width, S32 height); @@ -274,6 +275,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(); @@ -359,6 +361,7 @@ public: // static settings_map_t sSettingGroups; static LLUIAudioCallback sAudioCallback; + static LLUIAudioCallback sDeferredAudioCallback; static LLVector2 sGLScaleFactor; static LLWindow* sWindow; static LLView* sRootView; |