Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Xiaohong Bao
|
f4ff1430f0
|
first iteration of memory pool code
|
2010-12-03 22:16:16 -07:00 |
|
Tofu Linden
|
e416840f85
|
Backed out changeset c3d41f18ce2b
back-out the back-out for this branch. yay.
|
2010-08-24 19:22:00 +01:00 |
|
Tofu Linden
|
98cc236503
|
Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
|
2010-08-24 18:44:39 +01:00 |
|
Tofu Linden
|
6ba23344c9
|
merge heads. whew.
|
2010-08-24 18:37:53 +01:00 |
|
Oz Linden
|
06b0d72efa
|
Change license from GPL to LGPL (version 2.1)
|
2010-08-13 07:24:57 -04:00 |
|
Richard Nelson
|
566e3969f9
|
deprecated LLPanel::child*() methods
|
2010-07-30 10:02:30 -07: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
|
80be4c1d2d
|
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
|
2008-08-12 17:29:50 +00:00 |