diff options
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_social.xml | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_social_photo.xml | 29 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 6 |
3 files changed, 13 insertions, 29 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml index cd5609b0f8..0a7014c876 100644 --- a/indra/newview/skins/default/xui/en/floater_social.xml +++ b/indra/newview/skins/default/xui/en/floater_social.xml @@ -69,9 +69,9 @@ wrap="true" halign="left" valign="center" - text_color="Yellow" + text_color="DrYellow" font="SansSerif"> - Problem Connecting to Facebook + Error </text> <loading_indicator follows="left|top" @@ -92,8 +92,9 @@ wrap="true" halign="left" valign="center" + text_color="EmphasisColor" font="SansSerif"> - Connecting to Facebook... + Loading... </text> </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_social_photo.xml b/indra/newview/skins/default/xui/en/panel_social_photo.xml index 069e86c5f8..ddf2e5e613 100644 --- a/indra/newview/skins/default/xui/en/panel_social_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_social_photo.xml @@ -70,14 +70,6 @@ top="33" follows="left|top" left="9"> - <loading_indicator - follows="left|top" - height="24" - name="working_indicator" - left="113" - top="59" - visible="false" - width="24" /> <text follows="left|top|right" font="SansSerifBold" @@ -91,33 +83,18 @@ translate="false" type="string" visible="false"> - Working + Refreshing... </text> <button follows="left|top" height="22" image_overlay="Refresh_Off" - left="10" + left="20" name="new_snapshot_btn" + tool_tip="Click to refresh" bottom="-10" visible="false" width="22" /> - <text - follows="left|top" - font="SansSerifBold" - halign="left" - height="18" - left_pad="10" - length="1" - name="refresh_lbl" - text_color="red" - top_delta="4" - translate="false" - type="string" - visible="false" - width="130"> - Refresh to save - </text> </panel> <text length="1" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0f3f4619f6..5067922b88 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -148,6 +148,12 @@ Please try logging in again in a minute.</string> <string name="SentToInvalidRegion">You were sent to an invalid region.</string> <string name="TestingDisconnect">Testing viewer disconnect</string> + <!-- Facebook Connect and, eventually, other Social Network --> + <string name="SocialFacebookConnecting">Connecting to Facebook...</string> + <string name="SocialFacebookPosting">Posting...</string> + <string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string> + <string name="SocialFacebookErrorPosting">Problem posting to Facebook</string> + <!-- Tooltip --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> |