summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmedia.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llpanellandmedia.h
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llpanellandmedia.h')
-rw-r--r--indra/newview/llpanellandmedia.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanellandmedia.h b/indra/newview/llpanellandmedia.h
index e22e49ca35..4810a0a94c 100644
--- a/indra/newview/llpanellandmedia.h
+++ b/indra/newview/llpanellandmedia.h
@@ -46,9 +46,9 @@ public:
/*virtual*/ ~LLPanelLandMedia();
/*virtual*/ BOOL postBuild();
void refresh();
- void setMediaType(const LLString& media_type);
- void setMediaURL(const LLString& media_type);
- LLString getMediaURL();
+ void setMediaType(const std::string& media_type);
+ void setMediaURL(const std::string& media_type);
+ std::string getMediaURL();
private:
void populateMIMECombo();