Age | Commit message (Collapse) | Author | |
---|---|---|---|
2024-06-10 | Remove SharedCommitCallbackRegistry; add helpers CommitRegistrarHelper and ↵ | Mnikolenko Productengine | |
ScopedRegistrarHelper | |||
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 | |||
2023-11-30 | Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge | Andrey Lihatskiy | |
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml | |||
2023-08-23 | Merge branch 'main' into DRTVWR-588-maint-W | Andrey Lihatskiy | |
2023-08-23 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-08-04 | SL-19982 make sure 'item' is not null | Mnikolenko Productengine | |
2023-08-02 | SL-19982 update default help topic | Mnikolenko Productengine | |
2023-08-02 | SL-19982 Update font for menu items; show object's name in lsl editor | Mnikolenko Productengine | |
2023-08-01 | SL-19982 Adjustable font size in LSL editor | Mnikolenko Productengine | |
2023-02-15 | SL-19159 Build fixes | Andrey Kleshchev | |
2022-12-07 | SL-18777 PBR upload was stuck waiting for texture | akleshchev | |
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely. Unblock floater if upload fails. | |||
2022-09-16 | Merge branch master (DRTVWR-571) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h | |||
2022-08-23 | SL-17653 Local gltf materials #2 | Andrey Kleshchev | |
2022-05-13 | SL-16698 Replace tabs with spaces in Scripts | Mnikolenko Productengine | |
2021-07-19 | Merge with tip of Master after a Viewer release | Callum Prentice | |
2021-04-29 | Clean up a merge conflict | Callum Prentice | |
2021-04-29 | Merge master (DRTVWR-515) into DRTVWR-516-maint | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp | |||
2021-03-09 | This set of changes reverts the merge with master (git revert c83e740) and ↵ | Callum Prentice | |
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal | |||
2021-03-09 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵ | Brad Payne (Vir Linden) | |
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5. | |||
2021-03-02 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-02-03 | Merge with Master after Viewer release | Callum Prentice | |
2021-02-01 | Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵ | Andrey Kleshchev | |
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069) | |||
2021-02-01 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2020-10-27 | SL-14182 remove old script asset file after saving changes and allow ↵ | Mnikolenko Productengine | |
renaming files if destination file exists | |||
2020-10-23 | SL-14050 remove references to viewer-help | Mnikolenko Productengine | |
2020-09-28 | SL-13995 User Friendly Script Name In External Editor Tab | Andrey Kleshchev | |
2020-09-24 | Complete the change from lldiskcache -> llfilesystem and then addition of ↵ | Callum Prentice | |
new lldiskcache implementation | |||
2020-09-16 | Renamed the references to LLVFile and llvfile.* source code plus cmake ↵ | Callum Prentice | |
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more | |||
2020-09-16 | First part of change to remove LLVFS from the Viewer. Consists of code ↵ | Callum Prentice | |
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. | |||
2020-08-03 | SL-13691 wstring index was used for normal string | Andrey Kleshchev | |
2019-11-13 | Merge in from viewer-release 6.3.5 | Dave Houlton | |
2019-09-10 | Merge viewer-release 6.3.2 | Graham Linden | |
2019-09-10 | Merged in lindenlab/viewer-release | andreykproductengine | |
2019-08-10 | DRTVWR-493 LLUI to LLParamSingleton | andreykproductengine | |
2019-05-09 | SL-11121 FIXED Viewer crashes after clicking the 'Edit' button in the ↵ | maxim_productengine | |
notecard floater | |||
2019-04-03 | SL-10782 External edit button for Notecards | maxim_productengine | |
2018-08-03 | Merge | Rider Linden | |
2018-06-21 | Merge | Rider Linden | |
2018-05-30 | MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose ↵ | maxim_productengine | |
upload files within the first minute | |||
2018-05-22 | Merge | Rider Linden | |
2018-06-04 | MAINT-8716 Script name should be passed to "Save to file" dialog. | maxim_productengine | |
2018-02-26 | Added settings inventory object with subtype | Rider Linden | |
2018-01-16 | MAINT-7732 Crash in LLLiveLSLEditor::loadScriptText(..) | Mnikolenko Productengine | |
2017-11-10 | Remove delete preset dialog, Initial settings for selection level ↵ | Rider Linden | |
(Region/Parcel/Local) | |||
2017-08-30 | MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows ↵ | andreykproductengine | |
folder. | |||
2017-08-25 | MAINT-7752 FIXED Crash in LLPreviewNotecard::handleSaveChangesDialog | Mnikolenko Productengine | |
2017-08-23 | MAINT-7732 FIXED Crash in LLLiveLSLEditor::loadScriptText | Mnikolenko Productengine | |