summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml11
2 files changed, 1 insertions, 11 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b6b2d379d0..c381c5ec79 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -417,6 +417,7 @@ Jonathan Yap
STORM-1020
STORM-1064
STORM-960
+ STORM-1108
STORM-1094
STORM-1077
STORM-953
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 36f8f99178..84cfd31e05 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -307,17 +307,6 @@
tool_tip="Check to use display names in chat, IM, name tags, etc."
top_pad="3"/>
- <check_box
- control_name="EnableUIHints"
- follows="top|left"
- height="16"
- label="Enable Viewer UI Hints"
- layout="topleft"
- left="27"
- name="viewer_hints_check"
- top_pad="5"
- width="237"/>
-
<text
type="string"
length="1"