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-07-27 | Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵ | James Cook | |
for now, not complete. Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
QAR-424 | |||
2008-02-19 | merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵ | Steven Bennetts | |
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191 | |||
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-08 | svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-05-04 | svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-03-31 | svn merge -r 59364:59813 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
2007-01-02 | Print done when done. | James Cook | |