Pull merge from lindenlab/viewer-chui

2013-02-07 13:39:50 -08:00 · 2013-02-07 13:39:50 -08:00 · 3016afcd06
parent dac026a7d6 68a4a8402c
commit 3016afcd06
2 changed files with 2 additions and 0 deletions
--- 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"
--- 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"