Ansariel
|
088cc2ea35
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-09 02:25:42 +02:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
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 |
|
Nicky
|
406220fa40
|
Initialize variables to make GCC all happy and cheerful.
|
2019-04-03 00:25:17 +02:00 |
|
Ansariel
|
732f199cef
|
Merge Firestorm LGPL
|
2016-05-18 22:00:02 +02:00 |
|
Ansariel
|
dc000055a2
|
Remove the actual filter part of Appearance-AISFilter since deprecated UDP simulator messages are going to be removed from the backend in near future
|
2016-05-18 16:13:05 +02:00 |
|
Ansariel
|
2797c5938a
|
Merge Firestorm LGPL
|
2016-04-05 10:47:23 +02:00 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Nicky
|
c218e524b2
|
Merge - Step 1; Still enough to do.
|
2015-10-26 20:20:13 +01:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Rider Linden
|
907efc9cc9
|
MAINT-5507: Remove llcurl, move constant values and untilities to llcorehttp lib
|
2015-09-15 17:01:26 -07:00 |
|
Rider Linden
|
1138c57f9a
|
Convert LLCore::HttpHeaders to use shared_ptr<> rather than an intrusive_ptr<> for refrence counting.
|
2015-07-08 10:01:27 -07:00 |
|
Kitty Barnett
|
e5a0222707
|
- fixed : orphaned COF links (=remote deleted but not local deleted) cannot be removed when AIS is enabled
-> partial fix for https://jira.secondlife.com/browse/BUG-9506
--HG--
branch : Appearance-Misc
|
2015-06-27 04:45:24 +02:00 |
|
Rider Linden
|
6f4d36634e
|
Removal of RPCXML dep on LLCurl switching to LLCore::Html
|
2015-03-16 17:14:34 -07:00 |
|
Brad Payne (Vir Linden)
|
a5bb8839fa
|
merge fix
|
2014-05-16 15:47:34 -04:00 |
|
Brad Payne (Vir Linden)
|
487ca1bad3
|
v-r -> s-e merge WIP
|
2014-05-14 17:50:59 -04:00 |
|
Brad Payne (Vir Linden)
|
8f4f745230
|
SH-4226 WIP - try to be smarter about when to send appearance update requests, removed many redundant calls
|
2013-07-03 12:45:56 -04:00 |
|
Brad Payne (Vir Linden)
|
96a2173c64
|
SH-4176 WIP - allow retries on 4xx errors if enabled by flag. So enable in the case of appearance requests.
|
2013-05-10 09:32:30 -04:00 |
|
Brad Payne (Vir Linden)
|
e3bad9fb86
|
SH-4061 WIP - fix for build issues on mac, reset the retry policy on success.
|
2013-04-16 20:27:49 -04:00 |
|
Brad Payne (Vir Linden)
|
8d3afb35d8
|
SH-4061 - integrated LLHttpRetryPolicy with new corehttp header parsing
|
2013-04-15 18:58:58 -04:00 |
|
Brad Payne (Vir Linden)
|
bb237ce15f
|
SH_4061 WIP - retry policy org and tests
|
2013-04-12 17:04:48 -04:00 |
|
Brad Payne (Vir Linden)
|
a8cdcfc9a8
|
SH-4061 WIP - moved retry policy to newview so it can work with either llmessage or CoreHttp libraries. Updated tests.
|
2013-04-12 09:16:25 -04:00 |