diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 8e7edab927..b29b49b399 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1866,15 +1866,8 @@ void prepare_video(const LLParcel *parcel) void start_video(const LLParcel *parcel) { prepare_video(parcel); - bool web_url = (parcel->getParcelFlag(PF_URL_WEB_PAGE) || parcel->getParcelFlag(PF_URL_RAW_HTML)); std::string path( "" ); - #if LL_MOZILLA_ENABLED - if (web_url) - { - path = get_mozilla_path(); - } - #endif - LLMediaEngine::getInstance ()->convertImageAndLoadUrl ( true, web_url, path); + LLMediaEngine::getInstance ()->convertImageAndLoadUrl ( true, false, path); } void stop_video() |