8 Commits (77f56a3f3db72b2938eadb0868fc7be975dabafa)

Author	SHA1	Message	Date
Xiaohong Bao	77f56a3f3d	merge QAR-1579: texture-cleanup-1.	2009-07-10 22:02:26 +00:00
James Cook	52aeaa3284	Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: ... lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14	2009-07-07 00:53:05 +00:00
Steven Bennetts	9ec432034d	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ... ignore-dead-branch	2009-06-21 08:04:56 +00:00
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Mark Palange	f89f19990c	QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release	2008-11-07 17:51:03 +00:00
Steven Bennetts	25c10ed028	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release ... dataserver-is-deprecated	2008-06-26 00:39:00 +00:00
Steven Bennetts	941cb9f412	merge release@83343 skinning-1-merge@83714 -> release ... QAR-424	2008-04-01 17:45:04 +00:00
Brad Kittenbrink	6d52efe452	Merge of windlight into release (QAR-286). This includes all changes in ... windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620	2008-02-27 18:58:14 +00:00