diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llchatentry.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp index 1da7900f59..dea8ff9bb2 100644 --- a/indra/llui/llchatentry.cpp +++ b/indra/llui/llchatentry.cpp @@ -28,7 +28,7 @@ #include "llchatentry.h" -static LLDefaultChildRegistry::Register<LLChatEntry> r("text_editor"); +static LLDefaultChildRegistry::Register<LLChatEntry> r("chat_editor"); LLChatEntry::Params::Params() : has_history("has_history", true), diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index f6d5b20a65..0720a4b011 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -242,7 +242,7 @@ bottom="-1" follows="left|right|bottom" tab_group="1"> - <text_editor + <chat_editor bottom="0" expand_lines_count="5" follows="left|right|bottom" @@ -256,7 +256,7 @@ tab_group="3" width="240" wrap="true"> - </text_editor> + </chat_editor> </panel> </layout_panel> </layout_stack> |