viewer.git - Megapahit's fork of the Second Life viewer.

Age	Commit message (Collapse)	Author
2010-02-18	move base back to default because doing it as a backout was causing merge errors	Kent Quirk

2010-02-17	EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts ↵	Richard Linden
	1.23s UI reviewed by Leyla
2009-11-04	converted all floater titles to uppercase	richard

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-09-01	Sync up with a number of SVN changes that snuck in via weird merges	Bryan O'Sullivan

2009-05-11	Switch the XML file line endings to native.	Bryan O'Sullivan

2009-05-04	QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3	Adam Moss
	svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql