aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanellandmedia.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llpanellandmedia.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llpanellandmedia.h')
-rw-r--r--linden/indra/newview/llpanellandmedia.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h
index b2b0abe..7320f56 100644
--- a/linden/indra/newview/llpanellandmedia.h
+++ b/linden/indra/newview/llpanellandmedia.h
@@ -46,9 +46,9 @@ public:
46 /*virtual*/ ~LLPanelLandMedia(); 46 /*virtual*/ ~LLPanelLandMedia();
47 /*virtual*/ BOOL postBuild(); 47 /*virtual*/ BOOL postBuild();
48 void refresh(); 48 void refresh();
49 void setMediaType(const LLString& media_type); 49 void setMediaType(const std::string& media_type);
50 void setMediaURL(const LLString& media_type); 50 void setMediaURL(const std::string& media_type);
51 LLString getMediaURL(); 51 std::string getMediaURL();
52 52
53private: 53private:
54 void populateMIMECombo(); 54 void populateMIMECombo();