Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-10-03 | Merge 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-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2007-11-01 | svn merge -r 72652:72881 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam. | |||
2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
2007-05-02 | svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-03-07 | merge release@58791 vc8@58828 -> release | Steven Bennetts | |
Adds Dev Studio 2005 (VC8) Reviewed by Rob | |||
2007-02-06 | merge in of error-refactor-3 | Mark Lentczner | |
concludes (fixes) SL-31187 pair programmed and reviewed by markl and karen | |||
2007-01-02 | Print done when done. | James Cook | |