Ansariel
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02: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
acb6fda901
Merge viewer-eep
2019-01-26 00:02:49 +01:00
Rider Linden
c302e4ee96
SL-10268, SL-10323: Use _script_perm to display sit and change env questions. Exp log messages for environment changes."
2019-01-08 15:04:10 -08:00
Ansariel
63c895fe62
Merge viewer-quickgraphics
2016-03-10 08:50:20 +01:00
Ansariel
7ac279bc1d
Backed out changeset 9c8142fbc4df - change is available upstream
2016-03-10 08:48:21 +01:00
Ansariel
27fd7fdee6
More elegant solution to keep fix for MAINT-2879
2016-03-09 12:21:34 +01:00
Ansariel
47ebbd5006
Undo script permission bits cruft
2016-03-09 11:20:57 +01:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Cinder
ca08bd5aba
OPEN-292 - Remove lscript from project,
...
Remove legacy udp script upload methods,
Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2015-02-08 12:53:39 -07:00