summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-09-03 19:59:57 -0700
committercallum_linden <none@none>2015-09-03 19:59:57 -0700
commit83f26facbf717504b0ab4677cb6dd64534f6b844 (patch)
tree8f855d237b43a2c170c2e13e6bd75457243441f4 /indra
parent236b3b9f842c86e1f176068ab70b82f83874e2ab (diff)
point to new version of llceflib with fixed support for secondlife:// URLs
Diffstat (limited to 'indra')
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp1
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_viewer.xml2
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 97364d949a..f45ab5575c 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -52,7 +52,6 @@ public:
/*virtual*/
void receiveMessage(const char* message_string);
-
private:
bool init();
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2463c5f43b..a633ef3a52 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3185,7 +3185,7 @@
shortcut="control|shift|Z">
<menu_item_call.on_click
function="Advanced.WebContentTest"
- parameter="http://google.com"/>
+ parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
</menu_item_call>
<menu_item_call
label="FB Connect Test"