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

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

Browse Source
This commit is contained in:
Shyotl
2013-05-31 05:33:41 -05:00
parent 641ada030e
commit ef3e918558
148 changed files with 15636 additions and 4633 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">
@@ -335,6 +335,7 @@
<web_browser name="showcase_browser"
bottom="25"
follows="top|left|bottom|right"
trusted_content="true"
font="SansSerifSmall"
left="10"
right="-10"
@@ -692,7 +693,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

@@ -630,7 +630,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">
@@ -394,6 +394,7 @@
<web_browser name="showcase_browser"
bottom="25"
follows="top|left|bottom|right"
trusted_content="true"
font="SansSerifSmall"
left="10"
right="-10"
@@ -752,7 +753,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">

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

@@ -2678,14 +2678,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"
@@ -3482,6 +3502,16 @@ Join me in [REGION]
<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>
name="OfferTeleportFromGod"
type="alertmodal">
God summon user to your location?
@@ -7305,6 +7335,24 @@ 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
duration="10"
icon="notifytip.tga"
@@ -7313,14 +7361,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

@@ -224,7 +224,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" />

7
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,11 +62,6 @@
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"
max_chars="128" mouse_opaque="true" name="start_location_combo" width="155">
<combo_item name="MyHome" value="My Home">

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>