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

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp
This commit is contained in:
Lirusaito
2013-06-11 15:32:18 -04:00
parent 9ffd531ce6 72c186f0f4
commit fd453593b3
179 changed files with 16760 additions and 6029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/skins/default/xui/en-us/floater_directory.xml
View File

@@ -73,7 +73,7 @@
halign="center" height="18" label="?" label_selected="?" left="-25"
mouse_opaque="true" name="?" width="18" />
<web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
name="find_browser" right="-10" top="-60" />
name="find_browser" trusted_content="true" right="-10" top="-60" />
<text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
name="status_text" width="150" />
<string name="loading_text">
@@ -332,6 +332,7 @@
<web_browser name="showcase_browser"
bottom="25"
follows="top|left|bottom|right"
trusted_content="true"
font="SansSerifSmall"
left="10"
right="-10"
@@ -689,7 +690,7 @@ To buy direct, visit the land and click on the place name in the title bar.
<button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
<button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
<button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
<web_browser name="market_browser" bottom="25" follows="all" left="10" right="-10" top="-40"/>
<web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
<text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
<string name="loading_text">Loading...</string>
<string name="done_text">Done</string>

2
indra/newview/skins/default/xui/en-us/floater_directory2.xml
View File

@@ -627,7 +627,7 @@ To buy direct, visit the land and click on the place name in the title bar.
<button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
<button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
<button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home-4.png"/>
<web_browser name="market_browser" bottom="25" follows="all" left="10" right="-10" top="-40"/>
<web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
<text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
<string name="loading_text">Loading...</string>
<string name="done_text">Done</string>

5
indra/newview/skins/default/xui/en-us/floater_directory3.xml
View File

@@ -132,7 +132,7 @@
halign="center" height="18" label="?" label_selected="?" left="-25"
mouse_opaque="true" name="?" width="18" />
<web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
name="find_browser" right="-10" top="-60" />
name="find_browser" trusted_content="true" right="-10" top="-60" />
<text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
name="status_text" width="150" />
<string name="loading_text">
@@ -391,6 +391,7 @@
<web_browser name="showcase_browser"
bottom="25"
follows="top|left|bottom|right"
trusted_content="true"
font="SansSerifSmall"
left="10"
right="-10"
@@ -749,7 +750,7 @@ To buy direct, visit the land and click on the place name in the title bar.
<button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
<button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
<button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home-4.png"/>
<web_browser name="market_browser" bottom="25" follows="all" left="10" right="-10" top="-40"/>
<web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
<text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
<string name="loading_text">Loading...</string>
<string name="done_text">Done</string>

1
indra/newview/skins/default/xui/en-us/floater_tos.xml
View File

@@ -27,6 +27,7 @@ you must accept the agreement.
<!-- Loading text says: "Loading Terms of Service..." URL encoded -->
<web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
height="340" left="16" max_length="65536" mouse_opaque="true"
trusted_content="true"
name="tos_html"
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//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
width="568" word_wrap="true" />

1
indra/newview/skins/default/xui/en-us/floater_voice_license.xml
View File

@@ -28,6 +28,7 @@ To use voice, you must accept the license agreement.
<web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
height="340" left="16" max_length="65536" mouse_opaque="true"
name="license_html"
trusted_content="true"
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"
width="568" word_wrap="true" />
<string name="real_url">

152
indra/newview/skins/default/xui/en-us/floater_web_content.xml Normal file
View File

@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_close="true"
can_drag_on_left="false"
can_minimize="true"
can_resize="true"
height="440"
min_height="140"
min_width="467"
name="floater_web_content"
rect_control="FloaterMediaRect"
title="Web Browser"
initial_mime_type="text/html"
width="820">
<layout_stack
bottom="0"
follows="left|right|top|bottom"
left="5"
name="stack1"
top="-20"
mouse_opaque="false"
width="810">
<layout_panel
auto_resize="false"
bottom="0"
height="25"
left="0"
name="nav_controls"
user_resize="false"
mouse_opaque="false"
width="815">
<button
bottom="0"
follows="left|top"
height="25"
label=""
image_overlay="go-previous-4.png"
left="0"
name="back"
width="25" >
<button.commit_callback
function="WebContent.Back" />
</button>
<button
bottom_delta="0"
follows="left|top"
height="25" label=""
image_overlay="go-next-4.png"
left_delta="27"
name="forward"
width="25" >
<button.commit_callback
function="WebContent.Forward" />
</button>
<button
bottom_delta="0"
enabled="true"
follows="left|top"
height="25"
label=""
image_overlay="media_btn_stoploading.png"
name="stop"
left_delta="27"
width="25">
<button.commit_callback
function="WebContent.Stop" />
</button>
<button
bottom_delta="0"
follows="left|top"
height="25"
label=""
image_overlay="view-refresh-5.png"
name="reload"
left_delta="0"
width="25" >
<button.commit_callback
function="WebContent.Reload" />
</button>
<combo_box
allow_text_entry="true"
follows="left|top|right"
height="20"
left_delta="29"
max_chars="1024"
name="address"
select_all_on_focus_received="true"
bottom_delta="4"
width="706">
<combo_box.commit_callback
function="WebContent.EnterAddress" />
</combo_box>
<button
bottom_delta="-4"
follows="right|top"
enabled="true"
height="25"
label=""
image_overlay="media_btn_newwindow.png"
left_delta="709"
name="popexternal"
width="25">
<button.commit_callback
function="WebContent.PopExternal" />
</button>
</layout_panel>
<layout_panel
bottom="0"
height="20"
left="0"
name="external_controls"
auto_resize="true"
user_resize="false"
width="540">
<web_browser
bottom="0"
follows="left|right|top|bottom"
left="0"
name="webbrowser"
border_visible="false"
top="20"
width="540" />
</layout_panel>
<layout_panel name="status_bar"
height="23"
mouse_opaque="false"
auto_resize="false">
<text
type="string"
length="200"
follows="bottom|left"
height="20"
bottom="2"
left_delta="0"
name="statusbartext"
parse_urls="false"
width="495"/>
<progress_bar
color_bar="0.3 1.0 0.3 1"
follows="bottom|right"
height="16"
left="715"
bottom_delta="5"
left_pad="24"
name="statusbarprogress"
width="64"/>
</layout_panel>
</layout_stack>
</floater>

97
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -2679,14 +2679,34 @@ Display settings have been set to recommended levels based on your system config
[ERROR_MESSAGE]
</notification>
<notification
icon="alertmodal.tga"
name="AvatarMovedDesired"
type="alertmodal">
<tag>fail</tag>
Your desired location is not currently available.
You have been moved into a nearby region.
</notification>
<notification
icon="alertmodal.tga"
name="AvatarMoved"
type="notify">
Your [TYPE] location is not currently available. [HELP]
name="AvatarMovedLast"
type="alertmodal">
<tag>fail</tag>
Your requested location is not currently available.
You have been moved into a nearby region.
</notification>
<notification
icon="alertmodal.tga"
name="AvatarMovedHome"
type="alertmodal">
<tag>fail</tag>
Your home location is not currently available.
You have been moved into a nearby region.
You may want to set a new home location.
</notification>
<notification
icon="alertmodal.tga"
name="ClothingLoading"
@@ -2752,6 +2772,15 @@ Please choose the male or female avatar. You can change your mind later.
notext="Female"
yestext="Male"/>
</notification>
<notification icon="alertmodal.tga"
name="CantTeleportToGrid"
type="alertmodal">
Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]). Please close your viewer and try again.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
@@ -3493,11 +3522,24 @@ Join me in [REGION]
</form>
</notification>
<notification
icon="alertmodal.tga"
name="TooManyTeleportOffers"
type="alertmodal">
You attempted to make [OFFERS] teleport offers
which exceeds the limit of [LIMIT].
<tag>group</tag>
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="OfferTeleportFromGod"
type="alertmodal">
God summon user to your location?
God summon Resident to your location?
<form name="form">
<input name="message" type="text">
Join me in [REGION]
@@ -7375,6 +7417,34 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N
</unique>
</notification>
<notification
icon="notifytip.tga"
name="UnsupportedCommandSLURL"
priority="high"
type="notifytip">
The SLurl you clicked on is not supported.
<tag>fail</tag>
</notification>
<notification
icon="notifytip.tga"
name="BlockedSLURL"
priority="high"
type="notifytip">
<tag>security</tag>
A SLurl was received from an untrusted browser and has been blocked for your security.
</notification>
<notification
icon="notifytip.tga"
name="ThrottledSLURL"
priority="high"
type="notifytip">
<tag>security</tag>
Multiple SLurls were received from an untrusted browser within a short period.
They will be blocked for a few seconds for your security.
</notification>
<notification
duration="10"
icon="notifytip.tga"
@@ -7383,14 +7453,17 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N
type="notifytip">
The region you have entered is running a different simulator version. Click this message for details.
</notification>
<notification
icon="notifytip.tga"
name="UnableToOpenCommandURL"
priority="high"
type="notifytip">
The URL you clicked cannot be opened from this web browser.
</notification>
<notification
icon="alertmodal.tga"
name="ObjectMediaFailure"
type="alertmodal">
Server Error: Media update or get failed.
&apos;[ERROR]&apos;
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
name="MeshUploadError"

3
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -219,7 +219,8 @@
tool_tip="Automatically load ALL profile webpages without asking first."
width="127" />
<web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
ignore_ui_scale="false" left="10" name="profile_html" start_url=""
left="10" name="profile_html" start_url=""
trusted_content="true"
width="400" />
<text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
top="25" />

13
indra/newview/skins/default/xui/en-us/panel_login.xml
View File

@@ -2,6 +2,8 @@
<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
mouse_opaque="true" name="panel_login" width="800">
<web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
tab_stop="false"
trusted_content="true"
name="login_html" right="-1"
start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
top="-1" />
@@ -60,17 +62,12 @@
left="475" mouse_opaque="true" name="start_location_text" v_pad="0" width="120">
Start Location:
</text>
<combo_box allow_text_entry="true" bevel_style="in" border_style="line" border_thickness="1"
follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
height="20" hidden="false" left="529" bottom_delta="-24" max_chars="256" mouse_opaque="true"
name="regionuri_edit" select_all_on_focus_received="true" width="240" />
<combo_box allow_text_entry="true" bottom_delta="0" left="475" follows="left|bottom" height="20"
<combo_box allow_text_entry="true" bottom_delta="-24" left="475" follows="left|bottom" height="20"
max_chars="128" mouse_opaque="true" name="start_location_combo" width="155">
<combo_item name="MyHome" value="My Home">
<combo_item name="MyHome" value="home">
My Home
</combo_item>
<combo_item name="MyLastLocation" value="My Last Location">
<combo_item name="MyLastLocation" value="last">
My Last Location
</combo_item>
<combo_item name="Typeregionname" value="&lt;Type region name&gt;">

2
indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
View File

@@ -5,7 +5,7 @@
<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
<panel border="true" bottom="-200" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
<check_box bottom_delta="-20" control_name="AudioStreamingMedia" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>

4
indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" height="408" label="General" left="102" name="general_panel" width="517">
<radio_group bottom="-44" height="40" left="109" name="default_start_location" width="199">
<radio_item bottom="-20" height="20" name="MyHome" tool_tip="Log into my home location by default.">My Home</radio_item>
<radio_item bottom="-20" height="20" left="93" name="MyLastLocation" tool_tip="Log into my last location by default.">My Last Location</radio_item>
<radio_item bottom="-20" height="20" name="home" tool_tip="Log into my home location by default.">My Home</radio_item>
<radio_item bottom="-20" height="20" left="93" name="last" tool_tip="Log into my last location by default.">My Last Location</radio_item>
</radio_group>
<check_box bottom="-42" height="16" initial_value="true" label="Show Start Location on Login Screen" name="show_location_checkbox"/>
<combo_box bottom_delta="-27" follows="top" height="18" left="103" name="fade_out_combobox" width="111">

33
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -109,6 +109,39 @@
<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
<!-- tooltips for Urls -->
<string name="TooltipHttpUrl">Click to view this web page</string>
<string name="TooltipSLURL">Click to view this location's information</string>
<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
<string name="TooltipAgentInspect">Learn more about this Resident</string>
<string name="TooltipAgentMute">Click to mute this Resident</string>
<string name="TooltipAgentUnmute">Click to unmute this Resident</string>
<string name="TooltipAgentIM">Click to IM this Resident</string>
<string name="TooltipAgentPay">Click to Pay this Resident</string>
<string name="TooltipAgentOfferTeleport">Click to offer a teleport request to this Resident</string>
<string name="TooltipAgentRequestFriend">Click to send a friend request to this Resident</string>
<string name="TooltipGroupUrl">Click to view this group's description</string>
<string name="TooltipEventUrl">Click to view this event's description</string>
<string name="TooltipClassifiedUrl">Click to view this classified</string>
<string name="TooltipParcelUrl">Click to view this parcel's description</string>
<string name="TooltipTeleportUrl">Click to teleport to this location</string>
<string name="TooltipObjectIMUrl">Click to view this object's description</string>
<string name="TooltipMapUrl">Click to view this location on a map</string>
<string name="TooltipSLAPP">Click to run the secondlife:// command</string>
<string name="CurrentURL" value=" CurrentURL: [CurrentURL]" />
<!-- text for SLURL labels -->
<string name="SLurlLabelTeleport">Teleport to</string>
<string name="SLurlLabelShowOnMap">Show Map for</string>
<!-- label strings for secondlife:///app/agent SLapps -->
<string name="SLappAgentMute">Mute</string>
<string name="SLappAgentUnmute">Unmute</string>
<string name="SLappAgentIM">IM</string>
<string name="SLappAgentPay">Pay</string>
<string name="SLappAgentOfferTeleport">Offer Teleport to </string>
<string name="SLappAgentRequestFriend">Friend Request </string>
<!-- searching - generic -->
<string name="Searching">Searching...</string>

4
indra/newview/skins/default/xui/es/panel_preferences_general.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="General" name="general_panel">
<radio_group name="default_start_location" width="250">
<radio_item name="MyHome" tool_tip="Iniciar sesión de forma predeterminada en Mi Base.">
<radio_item name="home" tool_tip="Iniciar sesión de forma predeterminada en Mi Base.">
Mi Base
</radio_item>
<radio_item name="MyLastLocation" tool_tip="Iniciar sesión de forma predeterminada en mi última ubicación.">
<radio_item name="last" tool_tip="Iniciar sesión de forma predeterminada en mi última ubicación.">
Mi Última Ubicación
</radio_item>
</radio_group>

4
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Général" name="general_panel">
<radio_group name="default_start_location" width="280">
<radio_item name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>
<radio_item name="MyLastLocation" tool_tip="Par défaut, choisit le dernier emplacement comme lieu de départ.">Dernier emplacement</radio_item>
<radio_item name="home" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>
<radio_item name="last" tool_tip="Par défaut, choisit le dernier emplacement comme lieu de départ.">Dernier emplacement</radio_item>
</radio_group>
<check_box label="Afficher le lieu de départ sur l'écran de connexion" name="show_location_checkbox"/>
<combo_box name="fade_out_combobox">

4
indra/newview/skins/default/xui/pt/panel_preferences_general.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Geral" name="general_panel">
<radio_group name="default_start_location">
<radio_item name="MyHome" tool_tip="Como padrão, registrar na minha casa.">
<radio_item name="home" tool_tip="Como padrão, registrar na minha casa.">
Minha Casa
</radio_item>
<radio_item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade.">
<radio_item name="last" tool_tip="Por padrão, registrar na minha última localidade.">
Minha Última Localidade
</radio_item>
</radio_group>