Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
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 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03:00 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Lars Næsbye Christensen
|
9e854b697a
|
misc: BOOL to bool
|
2024-02-17 12:23:07 +02:00 |
|
Andrey Kleshchev
|
d00b6e4216
|
SL-15039 Prune unused preferences #1
List of removed preferences (usused per statistics):
AdvanceOutfitSnapshot
AnimationDebug
AskedAboutCrashReports
AudioLevelDoppler
AudioLevelRolloff
AudioLevelUnderwaterRolloff
AudioLevelWind
AutoAcceptNewInventory
AutoLoadWebProfiles
AvatarBacklight
AvatarPickerSortOrder
AvatarPosFinalOffset
AvatarBakedTextureUploadTimeout
AvatarBakedLocalTextureUpdateTimeout
AnimatedObjectsIgnoreLimits
AnimatedObjectsGlobalScale
AvatarBoundingBoxComplexity
StartUpChannelUUID
NearByChatChannelUUID
NotificationChannelUUID
AlertChannelUUID
AssetStorageLogFrequency
AvatarInspectorTooltipDelay
AllowBottomTrayButtonReordering
AvatarRotateThresholdSlow
AvatarRotateThresholdFast
|
2023-09-22 19:28:23 +03:00 |
|
Callum Prentice
|
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 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Callum Prentice
|
6be1f88a5e
|
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
|
2020-09-24 14:45:39 -07:00 |
|
Callum Prentice
|
38faec3b11
|
Merge branch 'master' into DRTVWR-519
|
2020-09-22 13:07:39 -07:00 |
|
Callum Prentice
|
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 |
|
Callum Prentice
|
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 |
|
Andrey Lihatskiy
|
3c564f5afc
|
SL-11625 Fix for skewed baked texture offset values
|
2020-07-02 21:20:13 +03:00 |
|
Anchor
|
72ed28efed
|
[SL-11548] - don't treat the local avatar bakes as alpha masks
|
2019-07-10 00:46:17 -07:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
callum_linden
|
577a3973ea
|
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
|
2014-10-20 14:00:39 -07:00 |
|
Brad Payne (Vir Linden)
|
7b9708a2e3
|
sunshine-external merge WIP
|
2014-05-13 10:02:26 -04:00 |
|
Brad Payne (Vir Linden)
|
da398cb12f
|
SH-3455 WIP - post-SSA cleanup
|
2013-09-23 18:15:25 -04:00 |
|
Brad Payne (Vir Linden)
|
029642b2bc
|
SH-3455 WIP - post-SSA cleanup, including removal of mUseServerBakes and related methods
|
2013-09-23 16:48:49 -04:00 |
|
Brad Payne (Vir Linden)
|
48bc05e93f
|
SH-3455 WIP - removing bake upload code
|
2013-09-19 16:14:59 -04:00 |
|
Brad Payne (Vir Linden)
|
36bb33b12a
|
sunshine cleanup annotations
|
2013-09-18 17:03:34 -04:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
Richard Linden
|
0a96b47663
|
merge with viewer-release
|
2013-06-05 19:05:43 -07:00 |
|
prep
|
a2a25c9ed5
|
merge
|
2013-04-08 17:11:24 -04:00 |
|
Brad Payne (Vir Linden)
|
d1d0a2cf67
|
SH-4058 - log spam reduction initiative.
|
2013-04-03 14:58:33 -04:00 |
|
prep
|
8e3b190e91
|
merge
|
2013-03-11 15:17:13 -04:00 |
|
Don Kjer
|
07d05c2967
|
Alpha rendering fixes for appearance utility.
|
2012-12-06 22:54:50 +00:00 |
|
Don Kjer
|
5483bc28ae
|
Moved gatherMorphMaskAlpha into llappearance.
|
2012-10-02 01:02:34 +00:00 |
|
Brad Payne (Vir Linden)
|
93e210d91f
|
more state management stuff, DRANO flags for problematic areas
|
2012-09-26 15:45:58 -04:00 |
|
Brad Payne (Vir Linden)
|
ab83fab72c
|
error checking, comments for areas needing fix/check in appearance
|
2012-09-26 11:52:19 -04:00 |
|
Brad Payne (Vir Linden)
|
ae0bb92290
|
renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly
|
2012-09-26 06:36:24 -04:00 |
|
Don Kjer
|
41301004e1
|
Cleanup actions from code review of llappearance with nyx
|
2012-09-04 22:49:26 +00:00 |
|
Don Kjer
|
204be2ba52
|
Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific LLViewerTexLayerSetBuffer
|
2012-09-04 15:18:15 +00:00 |
|
Don Kjer
|
21c364c4d4
|
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
|
2012-09-03 09:10:24 +00:00 |
|
Don Kjer
|
0c7623f628
|
Cleanup of llappearance refactor file definition order for easier diff'ing
|
2012-09-03 08:37:58 +00:00 |
|
Don Kjer
|
c355fb98d3
|
Extracted texture baking system into llappearance library.
|
2012-09-03 06:12:50 +00:00 |