Age | Commit message (Collapse) | Author |
|
final removal of remaining LLStat code
|
|
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
|
|
cleaned up LLStat and removed unnecessary includes
|
|
|
|
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
|
|
Checker: UNINIT_CTOR
Function: LLFloaterJoystick::LLFloaterJoystick(const LLSD &)
File: /indra/newview/llfloaterjoystick.cpp
|
|
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
|
|
ignore-dead-branch
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
|
|
merge viewer_1-21 96116-97380 -> release
|
|
dataserver-is-deprecated
|
|
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
|
|
merge 3dconnex-merge -r 84010 : 84039 -> release
|