10 Commits (22bbba4dd4b4e2c0528a26e47cdeafee25e4bd2b)

Author	SHA1	Message	Date
Monroe Williams	745845f799	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 ... svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.	2009-08-27 19:00:18 +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
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
Steven Bennetts	2e32d44e71	merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. ... QAR-290 = QAR-271 + QAR-191	2008-02-19 21:42:32 +00:00
Jon Wolk	7dd08303a3	svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134	2007-12-19 00:56:59 +00:00
Aaron Brashears	5595a99623	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00