diff options
| author | Richard Linden <none@none> | 2013-10-01 14:28:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-01 14:28:39 -0700 |
| commit | 59628d6f85deed89cb35d9343183069cfccd13c0 (patch) | |
| tree | 6b4c35053c2291fd5ff1cccedf86bbd76ce78e1d /indra/newview/llmediactrl.h | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
| parent | 9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rwxr-xr-x | indra/newview/llmediactrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 7f2a5e1642..db501cdb8c 100755 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -149,7 +149,7 @@ public: // over-rides virtual BOOL handleKeyHere( KEY key, MASK mask); - virtual void handleVisibilityChange ( BOOL new_visibility ); + virtual void onVisibilityChange ( BOOL new_visibility ); virtual BOOL handleUnicodeCharHere(llwchar uni_char); virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE); virtual void draw(); @@ -171,7 +171,7 @@ public: void convertInputCoords(S32& x, S32& y); private: - void onVisibilityChange ( const LLSD& new_visibility ); + void onVisibilityChanged ( const LLSD& new_visibility ); void onPopup(const LLSD& notification, const LLSD& response); const S32 mTextureDepthBytes; |