| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2009-11-04 | Redo Bao's broken merge | Bryan O'Sullivan | |
| 2009-11-02 | EXT-1866 : Inventory Side Panel | Loren Shih | |
| svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work. | |||
| 2009-10-01 | svn merge -r 134922:134973 ↵ | Monroe Williams | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0. | |||
| 2009-07-07 | Merge 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-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
| ignore-dead-branch | |||
| 2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
| 2008-12-15 | svn merge -r105329:105903 ↵ | Melinda Green | |
| svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4 | |||
| 2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
| dataserver-is-deprecated | |||
| 2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
| QAR-424 | |||
| 2007-11-07 | merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 | Steven Bennetts | |
| 2007-10-10 | svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 | Christian Goetze | |
| 2007-10-04 | Result 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-07-02 | svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
| release | |||
| 2007-05-04 | svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
| release | |||
| 2007-05-03 | Attempt to revert release r61312 checkin. Whitespace only | Arthur Abraham | |
| 2007-05-03 | Reverting check-in to release with no QA... svn merge ↵ | Don Kjer | |
| svn+ssh://svn/svn/linden/release -r 61312:61311 | |||
| 2007-05-03 | Solves SL-23488 | Arthur Abraham | |
| 2007-02-17 | merge -r 56779:58057 /branches/selection_management | Richard Nelson | |
| 2007-02-02 | Result of svn merge -r57264:57370 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | |||
| 2007-01-03 | corrected, removed, and updated comments throughout the code to be more ↵ | Aaron Brashears | |
| useful. no code changes. SL-13762 | |||
| 2007-01-02 | Print done when done. | James Cook | |
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |