diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
| commit | d65e512fa3a0e7bc7f1c269d2c8d2e1c38c4e970 (patch) | |
| tree | 324168722ec39359f4753aa4acf6ca65c8b72ab3 /indra/test_apps/llplugintest/llmediaplugintest.h | |
| parent | d3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (diff) | |
| parent | d3a9d6a6cef6630995c652b4cc04c8807dbe6d4e (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.h')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h index 8fa20b8d72..1f6f18e43c 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.h +++ b/indra/test_apps/llplugintest/llmediaplugintest.h @@ -51,6 +51,7 @@ struct mediaPanel int mId; std::string mStartUrl; std::string mMimeType; + std::string mTarget; LLPluginClassMedia *mMediaSource; int mMediaWidth; int mMediaHeight; @@ -91,16 +92,17 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner void draw( int draw_type ); void windowPosToTexturePos( int window_x, int window_y, int& media_x, int& media_y, int& id ); - void addMediaPanel( std::string url ); + mediaPanel* addMediaPanel( std::string url ); void updateMediaPanel( mediaPanel* panel ); void remMediaPanel( mediaPanel* panel ); - void replaceMediaPanel( mediaPanel* panel, std::string url ); + mediaPanel* replaceMediaPanel( mediaPanel* panel, std::string url ); void getRandomMediaSize( int& width, int& height, std::string mime_type ); void navigateToNewURI( std::string uri ); void initUrlHistory( std::string uri ); void selectPanelById( int id ); void selectPanel( mediaPanel* panel ); mediaPanel* findMediaPanel( LLPluginClassMedia* panel ); + mediaPanel* findMediaPanel( const std::string &target_name ); void makePickTexture( int id, GLuint* texture_handle, unsigned char** texture_pixels ); void makeChrome(); void resetView(); |