summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewnotecard.cpp
AgeCommit message (Collapse)Author
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
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-10-19Fix trivial memory leaks in note card processing, chat history, and task ↵Rye Mutt
inventory
2022-01-26SL-16698 Replace tabs with spaces which are used in the editorMnikolenko Productengine
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
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-521-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-521-maintAndrey Lihatskiy
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-10SL-14209 Saving notecard in object sometimes erases all contentAndrey Kleshchev
2020-10-06Add in the C++ filesystem based cache and clean up some indempotent ↵Callum Prentice
functions in llfilesystem
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-05-18SL-13266 FIXED Notecard editor external edit button graphical errorMnikolenko Productengine
2020-02-21Merge master (v 6.3.8) into DRTVWR-440Dave Houlton
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-10-02SL-11963 Notecard external Editor breaks the order of embeded contentmaxim_productengine
2018-11-28MAINT-8833 Don't cause dummy spamandreykproductengine
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-02-26Added settings inventory object with subtypeRider Linden
2017-09-26MAINT-7824 FIXED Items inside other notecards with full perms refuse to copy ↵Mnikolenko Productengine
into inventory when being looked at inside an object.
2017-08-25MAINT-7752 FIXED Crash in LLPreviewNotecard::handleSaveChangesDialogMnikolenko Productengine
2016-06-16MAINT-6495 Problem with saving notecard embedded in objectMnikolenko Productengine
2016-05-19Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-04-22MAINT-2063 Fixed User had ability to delete Notecards and textures from libraryandreykproductengine
2016-04-04merge with 4.0.3-releaseOz Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2016-01-15Merge VRRider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-10MAINT-909 FIXED Opening a notecard with the same name as one that is already ↵Mnikolenko ProductEngine
open does not work
2015-08-25MergeRider Linden
2015-08-18MAINT-5506: Fix ugly timing bug in llurlentry static initialization.Nat Goodspeed
The problem was that class-static LLUrlEntryParcel::sRegionHost was being initialized by copying class-static LLHost::invalid. Naturally, these two statics are initialized in different source files. Since C++ makes no promises about the relative order in which objects in different object files are initialized, it seems we hit a case in which we were trying to initialize sRegionHost by copying a completely uninitialized LLHost::invalid. In general we might attempt to address such cross-translation-unit issues by introducing an LLSingleton. But in this particular case, the punch line is that LLHost::invalid is explicitly constructed identically to a default-constructed LLHost! In other words, LLHost::invalid provides nothing we couldn't get from LLHost(). All it gives us is an opportunity for glitches such as the above. Remove LLHost::invalid and all references, replacing with LLHost().
2015-07-23Remove unused code and llassetuploadresponders files.Rider Linden
2015-07-17LSL Compile and upload from task object. Fix auto open when finished on all ↵Rider Linden
uploads...
2015-07-15LSL Script upload from inventory.Rider Linden
2015-07-11MAINT-5351: Finish messy merge restoring 'selfless' changes.Nat Goodspeed
2015-07-10MAINT-5356: Conversion of Notecards and Gesture to use new coroutine uploading.Rider Linden
Minor reorganization of Upload Info classes.
2015-01-15MAINT-4777 FIXED Confusing 'Save changes?' dialog when hitting the Delete ↵andreykproductengine
button in notecard edit floater
2015-01-19MAINT-1977 FIXED 'Open' menu item doesn't work for notecard (with 'anyone ↵andreykproductengine
can copy' permission) in object's content
2014-12-25MAINT-1863 FIXED 'Delete' button is always disabled for Notecard that was ↵andreykproductengine
opened from object's content
2014-05-07Merge downstream version 3.7.8 codesimon
2014-04-10MAINT-1695 FIXED Close floater after saving notecard.Mnikolenko ProductEngine
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-05merge with viewer-releaseRichard Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-10-17SH-3405 WIP convert existing stats to lltrace systemRichard Linden
started conversion of llviewerassetstats removed old, dead LLViewerStats code made units tracing require units declaration clean up of units handling
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:08:57 +0000