Commit Graph

46 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
Andrey Kleshchev a41855ac54 SL-17059 SEH crash at getRenderInfoFromRegion 2022-03-29 21:48:47 +03:00
Andrey Kleshchev 1d79d101ec SL-17040 Crash when looking for a region by handle or position
Might be a better idea to turn LLWorld back into an LLSingleton. Too many things to track.
2022-03-21 21:14:20 +02:00
Andrey Kleshchev d358cca943 SL-15365 LLCoros::launch crash
Superficially looks like an out of memory crash, redirect allocation failures into LL_ERRS.
2021-06-09 00:30:19 +03:00
Brad Payne (Vir Linden) ee464c2f16 MAINT-8790 - ignore control avatars when fetching or sending complexity stats. 2018-06-26 14:19:26 +01:00
andreykproductengine 0a36c8d3be MAINT-8689 Potential crash fix 2018-06-07 20:10:24 +03:00
Brad Payne (Vir Linden) cba0bb3038 SL-109 - little bit of log spam cleanup 2016-07-05 16:18:50 -04:00
Oz Linden f0107eb8aa fix merge error that broke reading avatar complexity reports from simulator 2016-04-05 17:01:15 -04:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden 2dcfa3b6bd Suppress some overly verbose logging 2016-02-12 16:58:41 -05:00
Rider Linden 75c6549fde Set consistent terminology for yield/wait -> suspend for coroutines. 2015-09-18 11:39:22 -07:00
Oz Linden 712a4e70c8 refine fix for MAINT-5560 based on review feedback and to fix VS objection 2015-08-26 12:07:16 -04:00
Oz Linden 206ef7a156 MAINT-5560: Correct imposter rendering flaws for avatars that have not had any attachments 2015-08-25 17:51:35 -04:00
andreykproductengine 75304b4ca8 MAINT-5378 Add notices for avatar complexity changes 2015-08-19 15:43:06 -04:00
Nat Goodspeed efa9a0f99c Backed out changeset bab1000e1b2d: restore 'selfless' changes 2015-07-10 19:30:10 -04:00
Oz Linden 90590a0604 add markers for where the UI notice hooks go 2015-07-08 12:09:00 -04:00
Rider Linden 247eb0c9c3 Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5 2015-07-07 19:41:27 +01:00
Nat Goodspeed b262ded7e0 MAINT-5351: Remove 'self' parameter from coroutine functions.
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
Rider Linden 0d3fb07bfa Remove vestigial httpclient.h include from files that no longer need it. 2015-06-03 16:04:40 -07:00
Oz Linden 3537b6a70e add reception of how many avatars report that you are over their limit 2015-05-15 15:30:04 -04:00
Rider Linden 3e004ce66e Updated feature manager downloader to coroutine.
Added "raw" coroutine handler (returns raw result as LLSD::Binary) and split out the guts of the get, put, etc methods.
Moved getStatusFromLLSD from HttpCoroHandler into HttpCorutineAdapter
2015-05-11 16:52:02 -07:00
Oz Linden 1da60c1d92 reorganize visual muting, impostors, and complexity criteria [does not render correctly yet] 2015-04-17 13:37:46 -04:00
Rider Linden c4bcc83336 Facebook conversion. 2015-04-16 17:01:10 -07:00
Rider Linden 0d302e692f Avatar rendering accountant upgrade. 2015-04-15 16:40:01 -07:00
Rider Linden 7353640387 first set of chnages from code review from Nat 2015-03-27 17:00:02 -07:00
Oz Linden c1e73c77f1 add visual mute status to rendering info reported to the simulator 2015-02-22 08:30:13 -05:00
Oz Linden d12f3d15d9 merge impostor and visual muting changes 2015-02-21 15:08:40 -05:00
Oz Linden fe627f6474 MAINT-4716: correct reading of and debug display for avatar render cost info 2014-12-15 15:59:49 -05:00
Oz Linden 9785a88ba4 further improvements to avatar render info display and logging of associated server messages 2014-12-03 10:13:50 -05:00
Oz Linden c71cf9cf23 Improve display of avatar rendering info, remove last use of RenderAutoMuteFunctions 2014-12-01 13:45:48 -05:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 321a81e371 Re-fix merge issue that removed "AvatarRenderInfo" cap usage 2013-12-10 13:24:10 -08:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
MaximB ProductEngine f806073646 MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control named RenderAutoMuteLoggingnot found. 2013-09-30 11:40:01 +03:00
simon 6d1c45f863 Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log message 2013-09-20 15:26:44 -07:00
simon 33e70236f0 MAINT-3161 : Clean up avatar muting code and prototype feature 2013-09-17 17:01:52 -07:00
simon dc54af030e MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for linked objects
Removed "geometry" and "surface"  Reviewed by Kelly
2013-08-27 14:57:43 -07:00
maksymsproductengine 63cc379c72 MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found 2013-10-04 02:50:50 +03:00
MaximB ProductEngine 9423692704 MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control named RenderAutoMuteLoggingnot found. 2013-09-30 11:41:16 +03:00
simon f41c8f5341 MAINT-2808 Viewer side : Stats for OBJECT_ATTACHMENT_GEOMETRY_BYTES and OBJECT_ATTACHMENT_SURFACE_AREA
do not return to the 'no attachments' values after avatar removes last attachment
2013-07-02 16:04:31 -07:00
simon cd8e0b92e1 Tweak to ensure more avatar rendering info is sent to the simulator 2013-05-09 11:10:13 -07:00
simon 15e2f76615 MAINT-2558 - Add viewer debug setting for more logging on avatar render info.
Reviewed by Kelly
2013-04-03 16:26:11 -07:00
simon d8dc74b833 MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. Reviewed by Kelly 2013-03-28 16:06:07 -07:00