a242e8bee2
Fix findChild during draw in notecard previews
2024-08-18 18:36:33 -04:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# 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-05-22 19:04:52 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
2b31dad400
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
f1095d7831
Merge branch 'main' into marchcat/main-contrib-merge
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/en/strings.xml
2023-04-07 00:20:59 +03:00
152f32918d
SL-18330: Fix egregious existing build errors in contribute branch.
2023-02-15 16:50:18 -05:00
e2496eff18
SL-19159 Build fixes
2023-02-15 23:42:58 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
c69c8aa347
SL-18777 PBR upload was stuck waiting for texture
...
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely.
Unblock floater if upload fails.
2022-12-07 02:16:12 +02:00
22dc6de993
Fix trivial memory leaks in note card processing, chat history, and task inventory
2022-10-19 19:41:46 -04:00
3d00b4bb6c
SL-16698 Replace tabs with spaces which are used in the editor
2022-01-26 16:31:23 +02:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and 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 14:39:51 -08:00
8d5f5b4ced
Merge branch 'master' into DRTVWR-521-maint
2021-03-09 22:00:01 +02:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
9ba43b5ce9
Merge branch 'master' into DRTVWR-521-maint
2021-03-02 21:42:32 +02:00
92af5af736
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
9b1d9150c2
Merge branch 'master' into DRTVWR-519
2020-11-11 13:22:35 -08:00
94be1ab38f
SL-14209 Saving notecard in object sometimes erases all content
2020-11-10 22:25:08 +02:00
3092aa8aae
Add in the C++ filesystem based cache and clean up some indempotent functions in llfilesystem
2020-10-06 17:16:53 -07:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake 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 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code 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-09-16 18:53:24 -07:00
b7d8c9107e
SL-13266 FIXED Notecard editor external edit button graphical error
2020-05-18 20:43:58 +03:00
7674c00fb9
Merge master (v 6.3.8) into DRTVWR-440
2020-02-21 12:05:46 -07:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
00cad756a2
SL-11963 Notecard external Editor breaks the order of embeded content
2019-10-02 17:31:13 +03:00
ace17533c9
MAINT-8833 Don't cause dummy spam
2018-11-28 21:29:11 +02:00
4af78ca09e
SL-11121 FIXED Viewer crashes after clicking the 'Edit' button in the notecard floater
2019-05-09 15:19:37 +03:00
584a05797d
SL-10782 External edit button for Notecards
2019-04-03 10:58:35 +03:00
b766466b30
Added settings inventory object with subtype
2018-02-26 09:27:14 -08:00
a65c18c1d3
MAINT-7824 FIXED Items inside other notecards with full perms refuse to copy into inventory when being looked at inside an object.
2017-09-26 11:21:02 +03:00
e46f66ff31
MAINT-7752 FIXED Crash in LLPreviewNotecard::handleSaveChangesDialog
2017-08-25 17:02:33 +03:00
d4f5b71434
MAINT-6495 Problem with saving notecard embedded in object
2016-06-16 13:56:12 +03:00
b25a22a2c1
Merged in lindenlab/viewer-release
2016-05-19 23:02:37 +03:00
e302b6f1f4
MAINT-2063 Fixed User had ability to delete Notecards and textures from library
2016-04-22 18:41:45 +03:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
e7eaa94dfa
Merge VR
2016-01-15 13:36:38 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
744c1453ed
MAINT-909 FIXED Opening a notecard with the same name as one that is already open does not work
2015-09-10 11:22:35 +03:00
96bb17f20b
Merge
2015-08-25 11:40:36 -07:00
62527e6f18
MAINT-5506: Fix ugly timing bug in llurlentry static initialization.
...
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-08-18 17:05:29 -04:00
7882396811
Remove unused code and llassetuploadresponders files.
2015-07-23 13:06:24 -07:00
d22812a8c8
LSL Compile and upload from task object. Fix auto open when finished on all uploads...
2015-07-17 14:32:14 -07:00
Rye Mutt