63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
a38e971f8d
Updates for non-allocating llsd changes (via Rye)
2021-06-13 12:37:29 +01:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
84e5dc37b6
MAINT-7847 The presence of certain Avatars stops local specular textures from "sticking". Yes really.
...
FIXED. Allows set material explicitly to material manager.
2018-02-14 20:52:31 +02:00
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
f727126c95
Merge viewer-bear
2018-01-25 21:55:38 +01:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
c56298d4ba
MAINT-8022 Make unzip silent yet include failure reason into output
2018-01-03 16:30:57 +02:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
594221790b
DRTVWR-418: Fix a couple unused-variable fatal warnings in local builds.
...
If the only use of a variable is within llassert(), have to make the
declaration conditional on SHOW_ASSERT rather than guesswork about release
builds.
2016-12-21 12:46:28 -05:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
0184c2fc83
Merge with https://bitbucket.org/rider_linden/maint-4952-v-t-u
2016-01-25 15:06:34 +01:00
e5bfdac024
MAINT-6071: Change reference to a copy to avoid later use of erased variable.
2016-01-20 09:46:25 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
8d334ca1bf
MAINT-5271: Converted internal pointers to internal operation to managed shared pointers. Removed direct cast and dereference of handles.
2015-10-16 11:40:48 -07:00
bbb9d4f21b
MAINT-5732: Change to the way event polling handles error conditions and cancel calls.
...
Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr
Started minor refactor in the materials manager into coroutines (unfinished)
2015-10-14 17:46:24 -07:00
fe5567639d
Change HttpOptions::ptr_t to be shared_ptr<> rather than intrusive.
2015-07-08 12:09:36 -07:00
1138c57f9a
Convert LLCore::HttpHeaders to use shared_ptr<> rather than an intrusive_ptr<> for refrence counting.
2015-07-08 10:01:27 -07:00
80d17b2dd9
MAINT-4952: Use IntrusivePtr for BufferArray,HttpHeaders,HttpOptions.
...
Specifically, change the ptr_t typedefs for these LLCore classes to use
IntrusivePtr rather than directly using boost::intrusive_ptr. This allows us
to use a simple ptr_t(raw ptr) constructor rather than having to remember to
code ptr_t(raw ptr, false) everywhere. In fact, the latter form is now invalid:
remove the now-extraneous 'false' constructor parameters.
2015-06-29 17:19:51 -04:00
edc1439bd6
Added AvatarNameCache as coroutine, with LLCore::HttpHandler to respond correctly to Event Pumps.
...
Added get/setRequestURL() to LLCore::HttpResponse
Removed URI from the HttpSDHandler.
2015-04-01 16:37:00 -07:00
7353640387
first set of chnages from code review from Nat
2015-03-27 17:00:02 -07:00
e140118fc4
Replace appearance responder with new LLCore Appearance Handler.
...
Prep for some slight cleanup of the code.
Add AP_AVATAR Policy
2015-03-25 11:31:11 -07:00
782b9a324d
No explicit NULL in shared constructor
2015-03-23 16:47:26 -07:00
9d676ce5b9
Clean up and use policies for Material transfer.
2015-03-20 13:16:25 -07:00
6b8c814df3
Adding new HTTP handling for material manager.
2015-03-19 17:01:21 -07:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
87fc26e0c6
SH-4666 WIP - modified LLMaterialsResponder to use httpSuccess()/httpFailure()
2014-01-06 17:29:39 -05:00
391ac367d6
SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
...
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
2013-11-19 17:40:44 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
8ae792b38a
move reading of the sim features to LLViewerRegion for consistency, a couple of minor cleanups
2013-06-28 16:18:08 -04:00
5f397fa583
NORSPEC-206: read RenderMaterialsCapability throttle rate per second from simulator
2013-06-28 13:29:11 -04:00
1c6783fdb5
NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if available
2013-06-26 09:43:01 -04:00
f04e9363b9
NORSPEC-266 fix issues with observer feedback on edits of material map parameters
2013-06-14 09:41:33 -07:00
66e5375967
NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 channels and make the materials CB use a UUID instead of this pointer for safety
2013-05-24 15:07:23 -07:00
260afbcece
NORSPEC-192 fix more incorrect batching, fix bug in reflecting normal map state in build tool, and protect against callback crashes when switching regions
2013-05-23 16:24:34 -07:00
74c1bc29e7
NORSPEC-189 restore old mat param update registration
2013-05-17 14:02:31 -07:00
666896ac4e
NORSPEC-119 put back TE-specific get registration in material manager stomped during 'reloading'.
2013-05-15 17:00:13 -07:00
ad09e2111c
NORSPEC-102 & Co Reloaded
2013-05-14 21:14:46 +02:00
d9e8ee7cfd
NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter
2013-05-13 13:02:53 -07:00
Ansariel