Commit Graph

13 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
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 bbbb8765fc Merge viewer-bear 2017-02-16 19:24:15 +01:00
Mnikolenko Productengine e138ca5e78 MAINT-7112 FIXED URI namespace /completename is still affected by the Usernames viewer setting. 2017-02-07 12:56:45 +02:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
Mnikolenko Productengine 2f40972dd8 MAINT-7031 /displayname & /completename should perform regardless of "View Display Names" viewer setting. 2017-01-11 13:52:40 +02:00
Ansariel 2889c5bf40 Merge viewer-bear 2016-05-09 17:24:00 +02:00
Mnikolenko Productengine b2fd397818 MAINT-6220 enable searching of the friend list with the classic username of the avatar. 2016-05-04 11:31:00 +03:00
Ansariel 00ba0b4201 Clean up formatting for easier readability 2015-04-30 09:36:42 +02:00
Ansariel 7c10bc072b Add OpenSim GetDisplayNames cap support - on special request by Lirusaito Faers 2015-01-09 20:43:35 +01:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00