Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "REVERT! Fix for media update commit."

Browse Source 
This reverts commit 36a95ec36e.
This commit is contained in:
Siana Gearz
2012-07-08 03:33:05 +02:00
parent a76a77a330
commit 045caad8f5
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/app_settings/settings.xml
View File

@@ -2200,28 +2200,6 @@
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>BrowserUseDefaultCAFile</key>
<map>
<key>Comment</key>
<string>Tell the built-in web browser to use the CA.pem file shipped with the client.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>BrowserCAFilePath</key>
<map>
<key>Comment</key>
<string>Tell the built-in web browser the path to an alternative CA.pem file (only used if BrowserUseDefaultCAFile is false)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>PluginAttachDebuggerToPlugins</key> <key>PluginAttachDebuggerToPlugins</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

4
indra/newview/llmediactrl.cpp
View File

@@ -345,6 +345,10 @@ BOOL LLMediaCtrl::postBuild ()
return true; return true;
} }
void LLMediaCtrl::onOpenWebInspector()
if (mMediaSource && mMediaSource->hasMedia())
mMediaSource->getMediaPlugin()->showWebInspector( true );
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask ) BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask )

11
indra/newview/llviewermedia.cpp
View File

@@ -488,6 +488,17 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
// set the path to the CA.pem file // set the path to the CA.pem file
media_source->addCertificateFilePath( ca_path ); media_source->addCertificateFilePath( ca_path );
// TODO: Only send cookies to plugins that need them
// Ideally, the plugin should tell us whether it handles cookies or not -- either via the init response or through a separate message.
// Due to the ordering of messages, it's possible we wouldn't get that information back in time to send cookies before sending a navigate message,
// which could cause odd race conditions.
std::string all_cookies = LLViewerMedia::getCookieStore()->getAllCookies();
lldebugs << "setting cookies: " << all_cookies << llendl;
if(!all_cookies.empty())
{
media_source->set_cookies(all_cookies);
}
mPluginBase = media_source; mPluginBase = media_source;
return true; return true;