summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterlagmeter.h
AgeCommit message (Collapse)Author
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-02-19Minor cleanup.Vadim Savchuk
--HG-- branch : product-engine
2010-02-19Fixed low priority bug EXT-4079 (Lag meter: Colons missing when first opened).Vadim Savchuk
--HG-- branch : product-engine
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
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-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵Steven Bennetts
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-09-21svn merge -r69926:70272 lag-meter, to pick up fixes for shrunk view, icon ↵James Cook
layout and ping time testing. QA passed by Devin.
2007-09-19svn merge -r 69906:69926 ↵James Cook
svn+ssh://svn.lindenlab.com/svn/linden/branches/lag-meter. Adds "Lag Meter" option to "Help" menu to give users more useful diagnostics when they see "laggy" behavior.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 21:41:49 +0000