summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
AgeCommit message (Collapse)Author
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-09-21DEV-39997: merging all of the recent xui file updates from theMartin Reddy
viewer2help-1 branch into viewer-2.0.0-3, to avoid divergence. This involves giving all floaters and side panels a help_topic attribute, to specify a logical name for that UI element's page in the help viewer. If you are creating/updating a floater or panel, please consider adding a help_topic field. For details, see the wiki page on XUI Documentation: https://wiki.lindenlab.com/wiki/XUI_Documentation#help_topic I'm also merging in some updates to the lastest floater button artwork to ensure these are 16x16 pixels. (Note, the new help code is still being developed in viewer2help-1 and is NOT being merged into 2.0 with this checkin. This is just data files.)
2009-08-14svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
2009-07-30merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-21merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r ↵Steven Bennetts
1078-1091 -> viewer-2.0.0-3
2009-06-23Set correct svn:eol-style native on XML files, converted several files to ↵James Cook
use consistent line feeds (had ^M after first header line). Not reviewed.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 02:38:11 +0000