diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-19 17:25:02 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-19 17:25:02 -0700 |
| commit | 9b1174243d3a264f296574329a73f945bf7165a7 (patch) | |
| tree | 63c90576481c1052e7aeebc52623290b3f469814 /indra/newview/llmediactrl.h | |
| parent | 892ca49503884daf26cff671047409ced4386547 (diff) | |
EXP-932 Implement system that fades from login page to (either) intro screen or loading screen instead of using a hard cut
EXP-938 Turn off in-world audio until fade from intro/loading page complete
EXP-939 Fade from intro/loading page to world, not to image of last login
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 6833453616..0e4a5b1d65 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -166,6 +166,8 @@ public: // Incoming media event dispatcher virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); + LLUUID getTextureID() {return mMediaTextureID;} + protected: void convertInputCoords(S32& x, S32& y); |