diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-02 12:16:49 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-02 12:16:49 -0800 |
| commit | 4c3d08b665800608b4597ec28cf84cfde5e65f88 (patch) | |
| tree | c53f0183b2d3b1474dfbb1c362afb05ac4487fee /indra | |
| parent | b92fe4351c402759991c26510a2a35a3b4308999 (diff) | |
Minor changes from review feedback
get rid of thunk function
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 0bee2e3abb..095430dcfc 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -628,7 +628,7 @@ static bool proximity_comparitor(const LLViewerMediaImpl* i1, const LLViewerMedi ////////////////////////////////////////////////////////////////////////////////////////// // static -void LLViewerMedia::updateMedia() +void LLViewerMedia::updateMedia(void *dummy_arg) { impl_list::iterator iter = sViewerMediaImplList.begin(); impl_list::iterator end = sViewerMediaImplList.end(); @@ -799,24 +799,18 @@ void LLViewerMedia::updateMedia() } -// idle callback function...only here to provide a hop to updateMedia() -static void llviewermedia_updatemedia_thunk(void*) -{ - LLViewerMedia::updateMedia(); -} - ////////////////////////////////////////////////////////////////////////////////////////// // static void LLViewerMedia::initClass() { - gIdleCallbacks.addFunction(llviewermedia_updatemedia_thunk, NULL); + gIdleCallbacks.addFunction(LLViewerMedia::updateMedia, NULL); } ////////////////////////////////////////////////////////////////////////////////////////// // static void LLViewerMedia::cleanupClass() { - gIdleCallbacks.deleteFunction(llviewermedia_updatemedia_thunk, NULL); + gIdleCallbacks.deleteFunction(LLViewerMedia::updateMedia, NULL); } ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 8acb485daf..24e7154805 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -96,7 +96,7 @@ class LLViewerMedia static bool textureHasMedia(const LLUUID& texture_id); static void setVolume(F32 volume); - static void updateMedia(); + static void updateMedia(void* dummy_arg = NULL); static bool isMusicPlaying(); static void initClass(); |