diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-09-16 13:29:35 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-09-16 13:29:35 -0700 |
| commit | d6f1f79ced7bb7fa0bb70e41c65f7d7de9c7a306 (patch) | |
| tree | e079e14dfcc0ef2a02310f819a5c032bcd62b6fd /indra/newview/llfloatermediabrowser.h | |
| parent | 387011a1ff519d0e339b446ff5d02f0d009b7e5d (diff) | |
| parent | 34ef02db00024ba82a35d9559393b21d0b19e25b (diff) | |
Merge of popup-geometry code.
Diffstat (limited to 'indra/newview/llfloatermediabrowser.h')
| -rw-r--r-- | indra/newview/llfloatermediabrowser.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloatermediabrowser.h b/indra/newview/llfloatermediabrowser.h index e6511c6e85..1a6f3a0352 100644 --- a/indra/newview/llfloatermediabrowser.h +++ b/indra/newview/llfloatermediabrowser.h @@ -43,7 +43,11 @@ public: LOG_CLASS(LLFloaterMediaBrowser); LLFloaterMediaBrowser(const LLSD& key); - static void create(const std::string &url, const std::string& target); + static void create(const std::string &url, const std::string& target, const std::string& uuid = LLStringUtil::null); + + static void closeRequest(const std::string &uuid); + static void geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height); + void geometryChanged(S32 x, S32 y, S32 width, S32 height); /*virtual*/ BOOL postBuild(); /*virtual*/ void onClose(bool app_quitting); @@ -52,7 +56,7 @@ public: // inherited from LLViewerMediaObserver /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); - void openMedia(const std::string& media_url); + void openMedia(const std::string& media_url, const std::string& target); void buildURLHistory(); std::string getSupportURL(); void setCurrentURL(const std::string& url); @@ -81,6 +85,7 @@ private: LLComboBox* mAddressCombo; std::string mCurrentURL; boost::shared_ptr<LLNotification> mCurNotification; + std::string mUUID; }; #endif // LL_LLFLOATERMEDIABROWSER_H |