diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
| commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
| tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/test_apps/llplugintest/llmediaplugintest.h | |
| parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
| parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) | |
Post-convert merge by convert_monolith.py from ./viewer-experience
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(); |