Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py
index 6e5628c211..c6f045349b 100755
--- a/indra/copy_win_scripts/start-client.py
+++ b/indra/copy_win_scripts/start-client.py
@@ -29,7 +29,7 @@ import llstart
 
 def usage():
     print("""start-client.py
-    
+
     --grid <grid>
     --farm <grid>
     --region <starting region name>
@@ -52,20 +52,20 @@ def start_client(grid, slurl, build_config, my_args):
     # Figure out path stuff.
     # The client should run from indra/newview
     # but the exe is at indra/build-<xxx>/newview/<target>
-    build_path = os.path.dirname(os.getcwd());    
+    build_path = os.path.dirname(os.getcwd());
     f = open("start-client.log", "w")
     print("Viewer startup arguments:", file=f)
-    llstart.start("viewer", "../../newview", 
+    llstart.start("viewer", "../../newview",
         "%s/newview/%s/secondlife-bin.exe" % (build_path, build_config),
         viewer_args, f)
     f.close()
 
 if __name__ == "__main__":
     grid = llstart.get_config("grid")
-    
+
     if grid == None:
         grid = "aditi"
-        
+
     build_config = llstart.get_config("build_config")
     my_args = llstart.get_config("viewer_args", force_dict = True)
     opts, args = getopt.getopt(sys.argv[1:], "u:r:f:g:i:h",
@@ -79,8 +79,8 @@ if __name__ == "__main__":
         if o in ("-h", "--help"):
             usage()
             sys.exit(0)
-            
-    slurl = llstart.get_config("slurl")            
+
+    slurl = llstart.get_config("slurl")
     if slurl == None:
         if region is None:
             region = llstart.get_user_name()
@@ -88,5 +88,5 @@ if __name__ == "__main__":
     # Ensure the slurl has quotes around it.
     if slurl is not None:
         slurl = '"%s"' % (slurl.strip('"\''))
-    
+
     start_client(grid, slurl, build_config, my_args)