Commit Graph

572 Commits (6c54c9f8a9e11ba3c00c0ac38c4bb8d3610ccc58)

Author SHA1 Message Date
Andrey Lihatskiy 91f9f2e9f7 DRTVWR-570 Mac build fix: unused variables cleanup 2022-10-27 23:08:09 +03:00
Brad Payne (Vir Linden) 3994101549 SL-18119 - more ViewerStats logs for NUX 2022-09-21 20:52:27 +01:00
Brad Payne (Vir Linden) 56e1db9c15 SL-18119 - UIUsage logs for some common operations 2022-09-16 17:09:55 +01:00
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
Andrey Lihatskiy 2ded530f93 Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappcorehttp.cpp
#	indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
Andrey Kleshchev b15f30a9ce SL-15501 Viewer crash with unprotected use of std::vector::front() 2021-06-30 17:34:39 +03:00
Andrey Kleshchev 823f97ac59 SL-15272 Bugsplat crashes at condition wait()
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-06-03 21:31:30 +03:00
Andrey Kleshchev 96cbe52803 SL-15272 Bugsplat crashes at condition wait()
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-05-21 20:52:08 +03:00
Mnikolenko Productengine 0cecb09a2f SL-15066 FIXED Wearing an existing, unsaved outfit does not restore correct wearables ordering 2021-04-14 16:01:58 +03:00
Andrey Lihatskiy 185082f1bb Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
#	indra/newview/llappviewer.cpp
2021-02-01 22:14:44 +02:00
Andrey Kleshchev 6397badddd SL-14303 Wearable type label should contain translated intead of default string
Startup has two initStrings calls, only after second one LLtrans will return properly translated calls, but we don't want 'translated' for logging, so modified logging to not use getTypeLabel.
2020-11-13 14:58:14 +02:00
Andrey Kleshchev 92af5af736 Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
Andrey Kleshchev 46ebe69f32 SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02:00
Andrey Kleshchev 1edd38e742 SL-14078 Maked couple functions as const 2020-10-12 18:35:34 +03:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
Andrey Kleshchev a42045994d SL-13555 'Second Life quit unexpectedly' error message 2020-08-28 01:30:37 +03:00
Mnikolenko Productengine 017627fa8b SL-13174 FIXED Changed sequence of worn items could not be saved 2020-05-14 19:41:19 +03:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
andreykproductengine 6ec37fac60 SL-12196 Crash at updateMeshTextures 2019-10-29 22:37:02 +02:00
maxim_productengine 645508e4e1 SL-11903 FIXED Crash in LLAppearanceMgr::slamCategoryLinks 2019-09-09 17:47:01 +03:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Graham Linden ed12bb1c77 Remove unused iterator for Xcode 10.2 happiness. 2019-04-03 09:58:46 -07:00
AndreyL ProductEngine e31f4a352d Mac buildfix 2019-05-14 01:14:54 +03:00
Rider Linden 1d022e86c8 Merge 2018-11-14 11:19:33 -08:00
Rider Linden 3888de9439 Merge 2018-05-22 13:16:37 -07:00
Brad Payne (Vir Linden) 7a006ea3a2 merge 2018-05-18 18:40:36 +01:00
Rider Linden b766466b30 Added settings inventory object with subtype 2018-02-26 09:27:14 -08:00
Andrey Kleshchev 3b9da6dc2f MAINT-8004 Make replace work regardless of current attachments 2018-02-06 17:36:51 +00:00
Brad Payne (Vir Linden) 299592e88e merge 2017-10-11 14:16:39 +01:00
Nat Goodspeed 135dd008da DRTVWR-479: Remove unused iterators to pacify Xcode 10.2. 2019-03-27 15:51:31 -04:00
Brad Payne (Vir Linden) 72010fba4d SL-718 - bug fixes for animated objects as attachments: Pause all associated avatars when selecting/editing. Don't apply joint positions to the attached avatar on login. 2017-08-04 16:20:04 +01:00
Mnikolenko Productengine 10028b15f6 MAINT-7745 FIXED After editing an outfit, duplicate photos appear in the Outfit Gallery for outfits that previously had no photo. 2017-09-04 16:51:22 +03:00
andreykproductengine 04618144ff MAINT-7665 Remove menu option should delete both links and images 2017-08-23 21:20:45 +03:00
andreykproductengine b7894fce4f MAINT-7665 Outfit folders should be capable of accepting images for preview 2017-08-14 20:04:06 +03:00
andreykproductengine 306cec78aa MAINT-7249 Fixing obsolete suffix for wearables that are no longer worn 2017-04-05 19:34:04 +03:00
andreykproductengine 535f5c5120 MAINT-7161 Crash in LLViewerInventoryItem 2017-03-01 19:26:26 +02:00
andreykproductengine fd81f83f6b MAINT-2438 Fixes wrong permissions source 2017-02-03 20:14:42 +02:00
andreykproductengine c4476c78f1 MAINT-2438 When wearing 2 pair of identical pants, only one pair was editable 2017-01-04 10:51:52 +02:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
andreykproductengine bd411d4503 MAINT-6562 Avatar COF was occasionally failing to update because Not Found 2016-12-01 13:58:24 +02:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
AndreyL ProductEngine 7fceb3a63f Merged in lindenlab/viewer-cleanup 2016-11-14 22:04:37 +02:00
AndreyL ProductEngine 8006d0e628 Reverted 208c0e0 2016-10-04 00:31:40 +03:00
Rider Linden 5ff1be79a3 Merge 2016-10-03 10:37:33 -07:00
Brad Payne (Vir Linden) 996861e21b merge 2016-09-27 08:03:48 -04:00