aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorJacek Antonelli2010-08-27 09:07:53 -0500
committerMcCabe Maxsted2010-08-28 05:02:00 -0700
commit87a4c18eb791a8318a2963cb3ff11b2fcab2beed (patch)
tree9a74205549bfa522fc7a162c5c7ca4562325f147 /linden/indra/newview/skins/default/xui
parentAdded faad2 plugin for Linux32. (But may be broken?) (diff)
downloadmeta-impy-87a4c18eb791a8318a2963cb3ff11b2fcab2beed.zip
meta-impy-87a4c18eb791a8318a2963cb3ff11b2fcab2beed.tar.gz
meta-impy-87a4c18eb791a8318a2963cb3ff11b2fcab2beed.tar.bz2
meta-impy-87a4c18eb791a8318a2963cb3ff11b2fcab2beed.tar.xz
Fixed terminology in the Vivox agreement window.
It's the "Acceptable Use Policy", not the "Personal License Agreement".
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml b/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
index 3a2b0be..c97c4f7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
@@ -9,14 +9,14 @@
9 label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel" 9 label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
10 width="100" /> 10 width="100" />
11 <check_box bottom="-435" follows="top|right" 11 <check_box bottom="-435" follows="top|right"
12 font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of the Vivox Personal License" 12 font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of the Vivox Acceptable Use Policy"
13 left="16" mouse_opaque="true" name="agree_chk" width="55" /> 13 left="16" mouse_opaque="true" name="agree_chk" width="55" />
14 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 14 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
15 bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif" 15 bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
16 h_pad="0" halign="left" height="30" left="16" mouse_opaque="true" 16 h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
17 name="license_heading" v_pad="0" width="552"> 17 name="license_heading" v_pad="0" width="552">
18Please read the following license carefully. 18Please read the following policy document carefully.
19To use voice, you must accept the license agreement. 19To use Vivox voice chat, you must agree to the terms of the policy.
20 </text> 20 </text>
21 <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif" 21 <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
22 height="283" left="16" max_length="65536" mouse_opaque="true" 22 height="283" left="16" max_length="65536" mouse_opaque="true"
@@ -24,13 +24,13 @@ To use voice, you must accept the license agreement.
24 word_wrap="true"> 24 word_wrap="true">
25 LICENSE_TEXT 25 LICENSE_TEXT
26 </text_editor> 26 </text_editor>
27 <!-- Loading text says: "Loading Vivox Personal License Agreement..." URL encoded --> 27 <!-- Loading text says: "Loading Vivox Acceptable Use Policy..." URL encoded -->
28 <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif" 28 <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
29 height="340" left="16" max_length="65536" mouse_opaque="true" 29 height="340" left="16" max_length="65536" mouse_opaque="true"
30 name="license_html" 30 name="license_html"
31 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Personal%20License%20Agreement%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E" 31 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
32 width="568" word_wrap="true" /> 32 width="568" word_wrap="true" />
33 <string name="real_url"> 33 <string name="real_url">
34 http://www.vivox.com/vivox_aup.html 34 http://www.vivox.com/vivox_aup.html
35 </string> 35 </string>
36</floater> \ No newline at end of file 36</floater>