Monroe Linden
|
b62b10dd26
|
Post-convert merge by convert_monolith.py from ./viewer-experience
|
2010-08-27 16:58:33 -07:00 |
|
Richard Nelson
|
124bc854dd
|
moved buildFloater out of lluictrlfactory to llfloater.cpp
|
2010-08-16 17:44:23 -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 |
|
Tofu Linden
|
a9d86c8133
|
CID-378
Checker: UNINIT_CTOR
Function: LLFloaterJoystick::LLFloaterJoystick(const LLSD &)
File: /indra/newview/llfloaterjoystick.cpp
|
2010-01-28 10:52:15 -08: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 |
|
Adam Moss
|
a879e13055
|
svn merge -c102054
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
|
2008-11-12 20:28:24 +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
|
d725e5b240
|
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
|
2008-09-29 19:14:50 +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
|
a3f3ab7e11
|
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
|
2008-04-17 02:56:14 +00:00 |
|
Steven Bennetts
|
f5e386527c
|
QAR-427
merge 3dconnex-merge -r 84010 : 84039 -> release
|
2008-04-04 01:22:03 +00:00 |