diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/skins/default/xui/en/floater_nearby_chat.xml | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_nearby_chat.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_nearby_chat.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index afac4a4051..2d67e3d5a9 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -28,5 +28,21 @@ color="1 1 1 1" enabled="true" image_name="closebox.tga" name="close_btn"/> </panel> - <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" /> + <text_editor + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + follows="left|top|right|bottom" + font="SansSerif" + layout="topleft" + height="320" + max_length="2147483647" + name="Chat History Editor" + read_only="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + bottom="0" + track_bottom="true" + width="250" + word_wrap="true" /> + </floater> |