Commit Graph

4 Commits (master)

Author SHA1 Message Date
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
Nicky b5e8e3025a Properly handle unicode paths in crashlogging (Windows). 2013-06-19 00:29:52 +02:00
Kitty Barnett 855401c39c Fixed compiler errors due to the crash reporting patch
-> shellapi.h is Windows-specific and shouldn't be included on Linux
  -> missing types due to old Windows SDK installation (resolved by #ifdef'ing offending sections when crash reporting isn't enabled for the build configuration)
2011-06-12 00:18:33 +02:00
Kitty Barnett 2bf2874f3f Imported Viewer-CrashReporting patch (based on changeset 1f48d184812d) 2011-05-08 14:41:26 +02:00