diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
commit | 1108cd0e5c052176f9dacc69b04d702a06b744de (patch) | |
tree | 21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/media_plugins/winmmshim/winmm_shim.cpp | |
parent | 2268bf38339178f93b317693c0a6808807301d64 (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/media_plugins/winmmshim/winmm_shim.cpp')
-rwxr-xr-x | indra/media_plugins/winmmshim/winmm_shim.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index 47a1e5c018..aac349bf57 100755 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -56,7 +56,7 @@ void ll_winmm_shim_initialize(){ // grab winmm.dll from system path, where it should live wsprintf(dll_path, "%s\\winmm.dll", system_path); HMODULE winmm_handle = ::LoadLibrary(dll_path); - + if (winmm_handle != NULL) { // we have a dll, let's get out pointers! initialized = true; |