summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
AgeCommit message (Collapse)Author
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-02-15SL-19159 Build fixesAndrey Kleshchev
2022-12-07SL-18777 PBR upload was stuck waiting for textureakleshchev
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely. Unblock floater if upload fails.
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-05-13SL-16698 Replace tabs with spaces in ScriptsMnikolenko Productengine
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey 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-09This 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-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "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-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge 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-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-10-27SL-14182 remove old script asset file after saving changes and allow ↵Mnikolenko Productengine
renaming files if destination file exists
2020-10-23SL-14050 remove references to viewer-helpMnikolenko Productengine
2020-09-28SL-13995 User Friendly Script Name In External Editor TabAndrey Kleshchev
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed 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-16First 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-03SL-13691 wstring index was used for normal stringAndrey Kleshchev
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-05-09SL-11121 FIXED Viewer crashes after clicking the 'Edit' button in the ↵maxim_productengine
notecard floater
2019-04-03SL-10782 External edit button for Notecardsmaxim_productengine
2018-08-03MergeRider Linden
2018-06-21MergeRider Linden
2018-05-30MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose ↵maxim_productengine
upload files within the first minute
2018-05-22MergeRider Linden
2018-06-04MAINT-8716 Script name should be passed to "Save to file" dialog.maxim_productengine
2018-02-26Added settings inventory object with subtypeRider Linden
2018-01-16MAINT-7732 Crash in LLLiveLSLEditor::loadScriptText(..)Mnikolenko Productengine
2017-11-10Remove delete preset dialog, Initial settings for selection level ↵Rider Linden
(Region/Parcel/Local)
2017-08-30MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows ↵andreykproductengine
folder.
2017-08-25MAINT-7752 FIXED Crash in LLPreviewNotecard::handleSaveChangesDialogMnikolenko Productengine
2017-08-23MAINT-7732 FIXED Crash in LLLiveLSLEditor::loadScriptTextMnikolenko Productengine
2017-07-28MAINT-7650 FIXED Crash in LLPreviewLSL::saveIfNeeded(bool)Mnikolenko Productengine
2017-03-30MAINT-7245 Use Experience Box in LSL Editor will not show as checked if ↵Mnikolenko Productengine
containing object is in another region
2016-07-29MAINT-1660 Don't hide script editor floater immediately after removing ↵Mnikolenko Productengine
script from inventory.
2016-04-14Fix further merge error in LLLiveLSLEditor::draw()Ansariel
2016-04-07OPEN-292: More removal of orphaned legacy script upload methodsAnsariel
2016-04-05Fix old merge issue in LLLiveLSLEditor::draw()Ansariel
2016-04-04merge with 4.0.3-releaseOz Linden
2016-03-17MergeRider Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:52:43 +0000