diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-06-13 14:23:56 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-06-13 14:23:56 -0700 |
| commit | 8bba5f20681bab14960da28a0b260d9178360709 (patch) | |
| tree | 8564fb7e74b610b2c7fe41dbb5cd71afd3ef12fb /indra/newview/skins | |
| parent | 186d6e0ac8ab27aa5045457f38933cdab206091c (diff) | |
| parent | 7019c39a97ffc10090d52a8545521e78d6583a0a (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_experienceprofile.xml | 23 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_experiences.xml | 1 |
2 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml index c6a749b45f..d146d1306f 100644 --- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml +++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml @@ -5,6 +5,7 @@ can_close="true" enabled="true" can_resize="true" + help_topic="floater_experienceprofile" title="EXPERIENCE PROFILE" save_rect="true" min_width="325" @@ -648,6 +649,17 @@ follows="top|left|right" label="Hide In Search" name="edit_private_btn"/> + <text + follows="left|top|right" + height="25" + layout="topleft" + left="10" + top_pad="10" + name="changes" + use_ellipses="true" + word_wrap="true" + value="Experience changes may take several minutes to be seen on all regions." + right="-10"/> <button follows="top|left" height="23" @@ -668,17 +680,6 @@ width="125" right="-10" visible="true"/> - <text - follows="left|top|right" - height="25" - layout="topleft" - left="10" - top_pad="10" - name="changes" - use_ellipses="true" - word_wrap="true" - value="Experience changes may take several minutes to be seen on all regions." - right="-10"/> </panel> </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml index fe959ea6d8..70e7507907 100644 --- a/indra/newview/skins/default/xui/en/floater_experiences.xml +++ b/indra/newview/skins/default/xui/en/floater_experiences.xml @@ -8,6 +8,7 @@ min_height="300" min_width="500" layout="topleft" + help_topic="floater_experiences" name="floater_experiences" save_rect="true" single_instance="true" |