fix issue with last merge due to trusted browser changes

11 files changed, 49 insertions, 1 deletions

diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
index 0513146e8c..0b5ac8e798 100644
--- a/indra/newview/llfloaterevent.cpp
+++ b/indra/newview/llfloaterevent.cpp
@@ -78,7 +78,6 @@ BOOL LLFloaterEvent::postBuild()
 	if (mBrowser)
 	{
 		mBrowser->addObserver(this);
-		mBrowser->setTrusted(true);
 	}
 
 	return TRUE;
diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml
index 1d16c942dd..58f2e555dd 100644
--- a/indra/newview/skins/default/xui/da/floater_event.xml
+++ b/indra/newview/skins/default/xui/da/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml
index 13108100f6..87fb580aba 100644
--- a/indra/newview/skins/default/xui/de/floater_event.xml
+++ b/indra/newview/skins/default/xui/de/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index 1be9748711..7ed020f832 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
index f37c722f03..8bca7783ab 100644
--- a/indra/newview/skins/default/xui/es/floater_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml
index 72361c0c1a..3527d89973 100644
--- a/indra/newview/skins/default/xui/fr/floater_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml
index 177305e648..9a0105a589 100644
--- a/indra/newview/skins/default/xui/it/floater_event.xml
+++ b/indra/newview/skins/default/xui/it/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index ec4188d300..9e99c4a931 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/nl/floater_event.xml b/indra/newview/skins/default/xui/nl/floater_event.xml
new file mode 100644
index 0000000000..45ec58abdf
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/floater_event.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ follows="all"
+ height="400"
+ can_resize="true"
+ help_topic="event_details"
+ label="Event"
+ layout="topleft"
+ name="Event"
+ save_rect="true"
+ save_visibility="false"
+ title="EVENT DETAILS" 
+ width="600">
+	<floater.string
+		name="loading_text">
+		Laden...
+	</floater.string>
+    <floater.string
+     name="done_text">
+        Done
+    </floater.string>
+  <web_browser
+     trusted_content="true" 
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="10"
+     name="browser"
+     height="365"
+     width="580"
+     top="0"/>
+	<text
+	 follows="bottom|left"
+	 height="16"
+	 layout="topleft"
+	 left_delta="0"
+	 name="status_text"
+	 top_pad="10"
+	 width="150" />	 
+</floater>
+
diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml
index 632e0b8a44..6b24720d86 100644
--- a/indra/newview/skins/default/xui/pl/floater_event.xml
+++ b/indra/newview/skins/default/xui/pl/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
index 548c0bff86..df4fe9a6a8 100644
--- a/indra/newview/skins/default/xui/pt/floater_event.xml
+++ b/indra/newview/skins/default/xui/pt/floater_event.xml
@@ -20,6 +20,7 @@
         Done
     </floater.string>
   <web_browser
+     trusted_content="true" 
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"