diff options
author | Merov Linden <merov@lindenlab.com> | 2013-07-10 19:26:42 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-07-10 19:26:42 -0700 |
commit | b22b47fde552d2b1951858b7a4707876744cf396 (patch) | |
tree | bf09092235fc4a215faa039aff3c3852210b7d7e /indra/newview/skins/default | |
parent | 722dc13dcc481900b3110fe54f840b2292ea3976 (diff) |
ACME-671 : Disable social panel UX while transaction (Post or Connection) is ongoing
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 5 insertions, 5 deletions
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 b4d2e4246e..ad901db748 100644 --- a/indra/newview/skins/default/xui/en/panel_social_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_social_photo.xml @@ -105,7 +105,7 @@ left="9" length="1" max_length="700" - name="caption" + name="photo_caption" type="string" word_wrap="true"> </text_editor> @@ -127,7 +127,7 @@ left="9" height="23" label="Post" - name="post_btn" + name="post_photo_btn" width="100"> <button.commit_callback function="SocialSharing.SendPhoto" /> @@ -136,7 +136,7 @@ follows="left|top" height="23" label="Cancel" - name="cancel_btn" + name="cancel_photo_btn" left_pad="15" top_delta="0" width="100"> diff --git a/indra/newview/skins/default/xui/en/panel_social_place.xml b/indra/newview/skins/default/xui/en/panel_social_place.xml index 856f94d88b..c0fc9ada75 100644 --- a/indra/newview/skins/default/xui/en/panel_social_place.xml +++ b/indra/newview/skins/default/xui/en/panel_social_place.xml @@ -97,7 +97,7 @@ follows="left|top" height="23" label="Cancel" - name="cancel_btn" + name="cancel_place_btn" left_pad="15" top_delta="0" width="100"> diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml index b6f3f00cd4..975f8cd29c 100644 --- a/indra/newview/skins/default/xui/en/panel_social_status.xml +++ b/indra/newview/skins/default/xui/en/panel_social_status.xml @@ -55,7 +55,7 @@ follows="left|top" height="23" label="Cancel" - name="cancel_btn" + name="cancel_status_btn" left_pad="15" top_delta="0" width="100"> |