summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-02-07 13:39:50 -0800
committerMerov Linden <merov@lindenlab.com>2013-02-07 13:39:50 -0800
commit3016afcd0623d8c086cfee36ebf5a0b3210c6fa5 (patch)
treec40e9e827333e995dbd14e276e38a85f0d810dfd /indra/newview/skins
parentdac026a7d6ad932ef185b4e5c5b5efd7b059e911 (diff)
parent68a4a8402ccd614f5cdb40cb53efa85166c12598 (diff)
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_conversation_log.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_conversation_preview.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 7229292a14..19a4cbc119 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -3,6 +3,7 @@
<floater
can_resize="true"
positioning="cascading"
+ help_topic="conversation_log"
height="200"
min_height="100"
min_width="230"
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 6f1ddaaf4f..764b9d8385 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -3,6 +3,7 @@
legacy_header_height="18"
can_resize="true"
default_tab_group="1"
+ help_topic="conversation_preview"
height="391"
layout="topleft"
min_height="243"