diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
commit | cd6044ed7a52e68e6050130ac2e9a637b8b7f339 (patch) | |
tree | 2295f1b2afce6815aec4b80ff447d65de31a67b4 /indra/newview/skins/default/xui/en/floater_top_objects.xml | |
parent | 22fc3409f4606459c6df219c343a002fc53a35cd (diff) | |
parent | 42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff) |
Merge viewer-release 6.2.2
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_top_objects.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_top_objects.xml | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 36ceddd305..b82fe43e74 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - height="372" + height="350" layout="topleft" min_height="300" min_width="450" @@ -16,7 +16,7 @@ </floater.string> <floater.string name="top_scripts_text"> - [COUNT] scripts taking a total of [TIME] ms + [COUNT] scripts taking a total of [TIME] ms and using [MEMORY] KB </floater.string> <floater.string name="scripts_score_label"> @@ -273,28 +273,4 @@ <button.commit_callback function="TopObjects.ReturnAll" /> </button> - <button - follows="bottom|left" - height="23" - label="Disable Selected" - layout="topleft" - - left="112" - name="disable_selected_btn" - width="130"> - <button.commit_callback - function="TopObjects.DisableSelected" /> - </button> - <button - follows="bottom|left" - height="23" - label="Disable All" - layout="topleft" - left_pad="10" - name="disable_all_btn" - top_delta="0" - width="130"> - <button.commit_callback - function="TopObjects.DisableAll" /> - </button> </floater> |