diff options
Diffstat (limited to 'scripts')
20 files changed, 11 insertions, 3 deletions
diff --git a/scripts/code_tools/fix_whitespace.py b/scripts/code_tools/fix_whitespace.py index 7a88265479..d5f7ce1cce 100644..100755 --- a/scripts/code_tools/fix_whitespace.py +++ b/scripts/code_tools/fix_whitespace.py @@ -70,7 +70,7 @@ def process_directory(directory, extensions, tab_stop): def main(): parser = argparse.ArgumentParser(description='Convert tabs to spaces in files, considering tab stops.') - parser.add_argument('-e', '--extensions', type=str, default='c,cpp,h,hpp,inl,py,glsl,cmake', help='Comma-separated list of file extensions to process (default: "c,cpp,h,hpp,inl,py,glsl,cmake")') + parser.add_argument('-e', '--extensions', type=str, default='c,cpp,m,mm,h,hpp,inl,py,glsl,cmake', help='Comma-separated list of file extensions to process (default: "c,cpp,h,hpp,inl,py,glsl,cmake")') parser.add_argument('-t', '--tabstop', type=int, default=4, help='Tab stop size (default: 4)') parser.add_argument('-d', '--directory', type=str, required=True, help='Directory to process') diff --git a/scripts/code_tools/fix_xml_indentations.py b/scripts/code_tools/fix_xml_indentations.py index a196b0b7d4..a196b0b7d4 100644..100755 --- a/scripts/code_tools/fix_xml_indentations.py +++ b/scripts/code_tools/fix_xml_indentations.py diff --git a/scripts/code_tools/modified-strings.sh b/scripts/code_tools/modified-strings.sh index 932b0a4bfc..932b0a4bfc 100644..100755 --- a/scripts/code_tools/modified-strings.sh +++ b/scripts/code_tools/modified-strings.sh diff --git a/scripts/code_tools/modified_strings.py b/scripts/code_tools/modified_strings.py index c777fc8c0d..c777fc8c0d 100644..100755 --- a/scripts/code_tools/modified_strings.py +++ b/scripts/code_tools/modified_strings.py diff --git a/scripts/content_tools/anim_tool.py b/scripts/content_tools/anim_tool.py index 07159a8052..07159a8052 100644..100755 --- a/scripts/content_tools/anim_tool.py +++ b/scripts/content_tools/anim_tool.py diff --git a/scripts/content_tools/arche_tool.py b/scripts/content_tools/arche_tool.py index 9979c61b21..9979c61b21 100644..100755 --- a/scripts/content_tools/arche_tool.py +++ b/scripts/content_tools/arche_tool.py diff --git a/scripts/content_tools/dae_tool.py b/scripts/content_tools/dae_tool.py index 5286c37de3..5286c37de3 100644..100755 --- a/scripts/content_tools/dae_tool.py +++ b/scripts/content_tools/dae_tool.py diff --git a/scripts/content_tools/skel_tool.py b/scripts/content_tools/skel_tool.py index 604d2b7db9..604d2b7db9 100644..100755 --- a/scripts/content_tools/skel_tool.py +++ b/scripts/content_tools/skel_tool.py diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 40ba2cc6b6..ad3ddd5a94 100755..100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -6818,6 +6818,10 @@ version 2.0 { CreationDate S32 } { CRC U32 } } + { + NewScriptInfo Variable + { TemplateID LLUUID } + } } // Create inventory diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index baa4f3f12b..96f24ca1ba 100755..100644 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -aaecaf01b6954c156662f572dc3ecaf26de0ca67
\ No newline at end of file +3edf45c784a5440d7dd24c59309faf52d1d01f47
\ No newline at end of file diff --git a/scripts/metrics/slp_conv.py b/scripts/metrics/slp_conv.py index 25f9a8c060..25f9a8c060 100644..100755 --- a/scripts/metrics/slp_conv.py +++ b/scripts/metrics/slp_conv.py diff --git a/scripts/metrics/viewer_asset_logs.py b/scripts/metrics/viewer_asset_logs.py index 4fb9fd15b3..4fb9fd15b3 100644..100755 --- a/scripts/metrics/viewer_asset_logs.py +++ b/scripts/metrics/viewer_asset_logs.py diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py index 4449111e46..340792158e 100755 --- a/scripts/packages-formatter.py +++ b/scripts/packages-formatter.py @@ -42,7 +42,7 @@ _autobuild_env=os.environ.copy() # Coerce stdout encoding to utf-8 as cygwin's will be detected as cp1252 otherwise. _autobuild_env["PYTHONIOENCODING"] = "utf-8" -pkg_line=re.compile('^([\w-]+):\s+(.*)$') +pkg_line=re.compile(r'^([\w-]+):\s+(.*)$') def autobuild(*args): """ @@ -122,6 +122,10 @@ if any(pkgs for pkgs in list(dups.values())): print("%s %s" % (args.channel, args.version)) print(viewer_copyright) +# Luau is server-side and isn't listed in the viewer's autobuild packages. +with open(os.path.join(os.path.dirname(__file__), "..", "indra", "newview", "luau.txt"), encoding="utf-8") as luau_license: + print("Luau " + " / ".join(line.strip() for line in luau_license if line.startswith("Copyright"))) +print() version = list(info['versions'].items()) version.sort() for pkg, pkg_version in version: diff --git a/scripts/perf/logsdir.py b/scripts/perf/logsdir.py index 5ab45a28b6..5ab45a28b6 100644..100755 --- a/scripts/perf/logsdir.py +++ b/scripts/perf/logsdir.py diff --git a/scripts/perf/perfbot_run.py b/scripts/perf/perfbot_run.py index 55ea2fae66..55ea2fae66 100644..100755 --- a/scripts/perf/perfbot_run.py +++ b/scripts/perf/perfbot_run.py diff --git a/scripts/perf/profile_cmp.py b/scripts/perf/profile_cmp.py index 9dbfa3145b..9dbfa3145b 100644..100755 --- a/scripts/perf/profile_cmp.py +++ b/scripts/perf/profile_cmp.py diff --git a/scripts/perf/profile_csv.py b/scripts/perf/profile_csv.py index 7a6b2b338e..7a6b2b338e 100644..100755 --- a/scripts/perf/profile_csv.py +++ b/scripts/perf/profile_csv.py diff --git a/scripts/perf/profile_pretty.py b/scripts/perf/profile_pretty.py index 405b14b373..405b14b373 100644..100755 --- a/scripts/perf/profile_pretty.py +++ b/scripts/perf/profile_pretty.py diff --git a/scripts/templates/template-cpp.cpp b/scripts/templates/template-cpp.cpp index 8ee04942bf..8ee04942bf 100755..100644 --- a/scripts/templates/template-cpp.cpp +++ b/scripts/templates/template-cpp.cpp diff --git a/scripts/templates/template-h.h b/scripts/templates/template-h.h index d7677c256b..d7677c256b 100755..100644 --- a/scripts/templates/template-h.h +++ b/scripts/templates/template-h.h |