| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2024-05-22 | Fix line endlings | Ansariel | |
| 2024-05-22 | Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A | Ansariel | |
| # Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp | |||
| 2024-04-29 | #824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵ | Andrey Lihatskiy | |
| LF, and trim trailing whitespaces as needed | |||
| 2024-02-21 | Convert remaining BOOL to bool | Ansariel | |
| 2024-02-21 | Convert BOOL to bool in llui | Ansariel | |
| 2017-11-16 | MAINT-8154 Disabled exception handling in LLAppViewer::frame() to get proper ↵ | AndreyL ProductEngine | |
| call stacks | |||
| 2015-11-10 | remove execute permission from many files that should not have it | Oz Linden | |
| 2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
| 2010-12-03 | first iteration of memory pool code | Xiaohong Bao | |
| 2010-08-24 | Backed out changeset c3d41f18ce2b | Tofu Linden | |
| back-out the back-out for this branch. yay. | |||
| 2010-08-24 | Backed out changeset a62bf7c0af21 | Tofu Linden | |
| Backing out this merge that I pushed (prematurely) to the wrong place. | |||
| 2010-08-24 | merge heads. whew. | Tofu Linden | |
| 2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
| 2010-07-30 | deprecated LLPanel::child*() methods | Richard Nelson | |
| 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-08-12 | QAR-767 Combined maint-render-7 and maint-viewer-9 merge | Steven Bennetts | |
| merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |