diff options
| author | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
| commit | 6599e10d00f3a47e90136f5f6cb4b2d1e02cb2e5 (patch) | |
| tree | d48c683923ee978db4dbb0d66cc0d9f45233a68e /indra/newview/llmediactrl.h | |
| parent | c16e726d0e2a8c607ce441eb5bf2419b16b41cab (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
Merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rwxr-xr-x | indra/newview/llmediactrl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 469ff38ee6..cb3a864d63 100755 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -150,7 +150,7 @@ public: void setTrustedContent(bool trusted); // over-rides - virtual BOOL handleKeyHere(KEY key, MASK mask); + virtual BOOL handleKeyHere( KEY key, MASK mask); virtual BOOL handleKeyUpHere(KEY key, MASK mask); virtual void onVisibilityChange ( BOOL new_visibility ); virtual BOOL handleUnicodeCharHere(llwchar uni_char); @@ -193,7 +193,8 @@ public: mHidingInitialLoad, mClearCache, mHoverTextChanged, - mDecoupleTextureSize; + mDecoupleTextureSize, + mUpdateScrolls; std::string mHomePageUrl, mHomePageMimeType, |