be40936881
trailing spaces from other branches
2024-09-19 12:40:56 -04:00
705ec153c5
Add script to compare a Frame Profile JSON stats file vs. baseline.
...
Extract `latest_file()` logic replicated in profile_pretty.py and
profile_csv.py out to logsdir.py, and use for new profile_cmp.py.
(cherry picked from commit 439cfc97a81f221daaf8ba13aa5daa87e8511047)
2024-09-18 17:04:46 -04:00
ee1b0061c3
Add script to convert frame profile JSON file to CSV.
...
Also slightly refactor profile_pretty.py.
(cherry picked from commit d60b1f92213ace6a8ab6a4a60cb01a43f45d3955)
2024-09-18 14:05:28 -04:00
277ee6830f
Add a JSON frame profile stats file pretty-printer script.
...
(cherry picked from commit ab3083819793a30911354670a7929b0d3f7c104c)
2024-09-18 14:05:28 -04:00
ab87978cbc
1836 dont store texture in system memory unless absolutely necessary ( #1843 )
...
* #1836 Texture memory usage overhaul. Much decrufting
- don't keep a copy of textures in system memory
- use GPU to downrez textures instead of reloading from cache
- use GPU to generate brightness/darkness bumpmaps
2024-06-27 13:12:43 -05:00
a52391d582
Fixed incomplete merge in message_template.msg.sha1
2024-06-20 14:40:14 -07:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
f74c10c4ec
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
2024-06-10 20:03:54 +03:00
34dfd7d599
Update fix_whitespace.py to handle newlines correctly
2024-06-10 17:05:19 +03:00
a0b3021bdc
Trim trailing whitespace
...
Start trimming trailing whitespace, but limit the blast radius to a
handful of file types.
2024-05-29 08:10:00 -07:00
a1f49564d6
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
2024-05-23 11:31:19 -07: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
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07:00
4af9128db1
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
2024-05-06 16:40:12 -07:00
8b747cee18
BOOL to bool
2024-05-06 16:49:24 -05:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
e7eced3c87
#824 Don't fix tabs in files with no tabs
2024-05-01 07:58:22 +03:00
d48497268e
#824 Add c,py,glsl to the script's default file types
2024-05-01 07:39:56 +03:00
af4ea94efc
#824 Add a script to convert tabs to spaces in the code files
2024-04-29 07:06:48 +03:00
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
0ae8bbaf5d
Checkpoint WebRTC Voice
2024-02-08 18:34:00 -08:00
65eec6d217
XML formatting tool - add LF before EOF
2024-01-18 23:30:43 +02:00
82d8b2a720
sl-20635 attempts at build fixes, added a few stray log messages about log file changes
2024-01-05 19:01:40 +00:00
516d7a890d
Add EOL, hopefully make pre-commit happy
2024-01-05 00:21:14 +00:00
3777dbb3d6
More sl-20635 - moved new attachment data to AvatarAppearance message
2023-12-08 23:57:40 +00:00
c409236dac
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-11-30 18:09:29 +02:00
27dae1d967
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
9bf5ad98e5
XML formatter script - simplify the default declaration
2023-11-24 09:49:19 +02:00
6e63fe32ef
XML formatter script - added control for the declaration tag
2023-11-24 09:40:27 +02:00
2c93819d27
XML formatter script - added license
2023-11-21 00:16:33 +02:00
586da70a5a
Added the script for adjusting XUI xml format
2023-11-20 10:47:30 +02:00
4d4abdd769
SL-20579 Added "--outfile" and "--files" options to the translation export script
2023-11-08 05:45:53 +02:00
e3e1d42ab3
SL-20229 update message template hash
2023-09-11 09:31:16 -05:00
455bbcf742
SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides
2023-08-29 16:42:55 -05:00
7d05ade3f1
SL-18330: Merge branch 'main' of secondlife/viewer into xcode-14.3
2023-06-01 09:56:41 -04:00
ed92f1d803
SL-18330: Consistently use new standalone Python llsd package.
2023-05-31 16:34:04 -04:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
b5688b8b20
Update default URL for message template in template_verifier.py as well
2022-11-21 21:15:01 +01:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
b3bfe05494
SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.
...
# Conflicts:
# scripts/content_tools/anim_tool.py
2022-05-18 23:31:08 +03:00
307db06310
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
cca7e12e1b
Bring packages formater step on par with 3p installation:
...
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
2022-04-07 02:35:47 +02:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
719702a95a
Fix template verifier erroneously failing checksum check
2022-02-02 12:16:51 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
Nat Goodspeed