diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-09 10:47:47 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-09 10:47:47 +0200 |
| commit | fd9d1f985e93cf5eec196f9b6ba0c08c67d49aea (patch) | |
| tree | f7d8c470d385eb3bdeffe5383651dcec05e74702 /indra/newview/skins | |
| parent | 64fe330620459be18ee4dd54866386a8f6a76ab8 (diff) | |
| parent | 5ecac2e900054526c5e9e2fe5610f470ad06df32 (diff) | |
merging
Diffstat (limited to 'indra/newview/skins')
3 files changed, 3 insertions, 1 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" diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml index a6e9a40e31..45cf780557 100644 --- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml @@ -9,5 +9,5 @@ <menu label="New Body Parts" layout="topleft" - name="COF.Geear.New_Body_Parts" /> + name="COF.Gear.New_Body_Parts" /> </toggleable_menu> |