Commit Graph

4 Commits (b49c3a083b73f6a5762f353f618a2e1fe25cf690)

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
Ansariel 24edb1e6ff Minor fixes for previous commit 2017-09-30 19:01:47 +02:00
Christopher Colosi 4ad7d4b750 Support for multiple currency solutions on a grid and across the hypergrid. 2017-09-20 16:00:25 -07:00
Nicky ebf410523f Move teapot files into llcommon. 2016-01-06 11:50:43 +01:00