6 Commits (b2632c50efc12eacdcadace64e6c0f1906b86ff6)

Author	SHA1	Message	Date
Richard Nelson	eb853f55c0	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
James Cook	8f7ec64899	Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window 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-07-27 17:56:26 +00:00
Monroe Williams	09d9b0556e	svn merge -r 127173:127174 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04 ... Cherry-picking a change to the code that uses the copy of skins in the development tree instead of the version in the app bundle on the mac. Reviewed by James.	2009-07-15 23:16:09 +00:00
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