diff options
author | thickbrick | 2011-04-01 16:29:49 +0300 |
---|---|---|
committer | thickbrick | 2011-04-01 16:29:49 +0300 |
commit | 1235da40f858cebed5d999dc35196ab62d3de77e (patch) | |
tree | 7d1f1501b0f4979b37ce0112358c73ddac8606c1 /linden/indra/newview/llmediaremotectrl.cpp | |
parent | Fix 829: Several changes to media filter (diff) | |
download | meta-impy-1235da40f858cebed5d999dc35196ab62d3de77e.zip meta-impy-1235da40f858cebed5d999dc35196ab62d3de77e.tar.gz meta-impy-1235da40f858cebed5d999dc35196ab62d3de77e.tar.bz2 meta-impy-1235da40f858cebed5d999dc35196ab62d3de77e.tar.xz |
Fix #838: disable hiding of stream urls
NoObscuredURL Patch from Henri Beauchamp, applied by hand because of
changes between Imprudence and Snowglobe.
Diffstat (limited to 'linden/indra/newview/llmediaremotectrl.cpp')
-rw-r--r-- | linden/indra/newview/llmediaremotectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp index 8186293..2f6dbdf 100644 --- a/linden/indra/newview/llmediaremotectrl.cpp +++ b/linden/indra/newview/llmediaremotectrl.cpp | |||
@@ -172,7 +172,7 @@ void LLMediaRemoteCtrl::enableMediaButtons() | |||
172 | { | 172 | { |
173 | // Set the tooltip | 173 | // Set the tooltip |
174 | // Put this text into xui file | 174 | // Put this text into xui file |
175 | media_url = parcel->getObscureMedia() ? mControls->getString("media_hidden_label") : parcel->getMediaURL(); | 175 | media_url = parcel->getMediaURL(); |
176 | media_type = parcel->getMediaType(); | 176 | media_type = parcel->getMediaType(); |
177 | 177 | ||
178 | play_media_enabled = true; | 178 | play_media_enabled = true; |