phoenix-firestorm

Commit Graph

Author	SHA1	Message	Date
Ansariel	1cca913ba7	Merge branch 'develop' of https://github.com/secondlife/viewer # Conflicts: # indra/cmake/CMakeLists.txt # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/llmodelloader.cpp # indra/llrender/llgl.h # indra/llrender/llrender.h # indra/llui/llurlentry.cpp # indra/llui/llurlentry.h # indra/newview/llviewerdisplay.cpp # indra/newview/llvoavatar.cpp	2024-09-13 18:54:12 +02:00
Andrey Kleshchev	047eb16f4c	viewer#2529 Optimize updateGLVariablesForSettings Intent is to eventually use only stored variables for everything. LLSD operations are far too expensive.	2024-09-11 14:09:01 +03:00
Ansariel	591c75ebaf	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llmath/llvolume.cpp # indra/llmessage/llcorehttputil.cpp # indra/llrender/llgl.cpp # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llfloater360capture.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llviewertexture.cpp # indra/newview/viewer_manifest.py	2024-06-10 21:53:31 +02:00
Ansariel	c0fad3028f	Re-enable compiler warnings C4018, C4100, C4231 and C4506	2024-06-10 16:42:43 +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
Ansariel	846d78345c	Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer	2020-04-01 15:00:34 +02:00
Andrey Kleshchev	a7849c6ec4	Removed obsolete and misleading variable	2020-03-27 00:24:07 +02:00
Kadah_Coba	f917c39b4f	Initial QP day cycle slider to see if method is viable	2019-04-04 02:13:55 -07:00
maxim_productengine	598cd8a30f	MAINT-9066 EEP should not be able to delete all Keyframes from Ground Level or Water	2018-09-10 17:31:31 +03:00
Graham Linden	597d28ad34	Fix constness of LLSettingsVODay::buildDeepCloneAndUncompress.	2018-08-16 22:00:53 +01:00
Graham Linden	5ddd9d0c97	Make settings vfuncs use SETTINGS_OVERRIDE macro (override keyword in viewer codebase) to fix OS X compilation. Mark cloning funcs and derived class overrides as const.	2018-08-16 21:38:49 +01:00
andreykproductengine	584fec695b	MAINT-8952 EEP 'uncompress' day tracks before editing	2018-08-15 18:31:07 +03:00
andreykproductengine	51abc168c0	MAINT-8902 fix encroaching 'legacy' issues	2018-08-03 21:01:43 +03:00
Rider Linden	3f6cedbbf3	Synch settings with simulator.	2018-08-03 16:32:31 -07:00
Rider Linden	9391744164	Add default and wellknown asset ids.	2018-07-16 16:49:49 -07:00
Graham Linden	5c2f49b865	Make distinct ALM moon shader, tweak mix factor for day vs night moon shading, and fix transposed name of daycycle func.	2018-06-27 22:00:50 +01:00
Rider Linden	8365945f8a	Settings inventory picker.	2018-06-08 16:40:01 -07:00
Rider Linden	bff5049b92	Various editor fixes. Start adding a settings picker.	2018-06-06 17:10:58 -07:00
Graham Linden	11a7c22b72	Merge	2018-06-05 16:39:11 +01:00
Rider Linden	b06803225b	Reconnect apply to region and parcel reconnected to interface.	2018-06-04 16:50:13 -07:00
Graham Linden	cd8f0da2d1	Fix use of new typedefs in inventory settings code in llenvironment.	2018-06-04 23:12:21 +01:00
Graham Linden	38271e9980	Remove redundant typedef hosing OSX build.	2018-06-03 00:35:17 +01:00
Graham Linden	7136956b90	Use more typedefs to simplify sync between viewer and sim env settings code.	2018-06-02 23:28:48 +01:00
Graham Linden	7d6743f42d	Merge	2018-06-02 00:31:25 +01:00
Rider Linden	2a613d7363	Rework preset loading and context menu from inventory.	2018-06-01 16:24:36 -07:00
Graham Linden	8cfdc07e79	Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.	2018-06-01 23:32:30 +01:00
Rider Linden	581869f2ca	Merge	2018-05-24 13:30:39 -07:00
Rider Linden	fa4ac065cb	Enable sky changes with altitude.	2018-05-24 13:11:33 -07:00
andreykproductengine	c75eeab839	MAINT-8344 Day Cycle Editor (playing)	2018-05-23 19:01:52 +03:00
Rider Linden	044b80e4e1	Manual blender for use in day editing dialog.	2018-05-22 10:49:55 -07:00
Rider Linden	430c5cd235	Self contained looping track blender. Will blend over time across an entire track in a day cycle.	2018-05-17 16:16:33 -07:00
andreykproductengine	28d0fa0c69	MAINT-8344 Day cycle editor (part 2)	2018-05-16 20:25:42 +03:00
andreykproductengine	cef4e29b90	MAINT-8344 Day cycle editor (part 1)	2018-05-11 20:10:08 +03:00
Rider Linden	cbe4cac78c	Settings type inventory objects and upload the assests.	2018-03-06 14:58:39 -08:00
Rider Linden	edc12edaae	Missed two overrides.	2018-02-27 11:02:37 -08:00
Rider Linden	87f5675455	XCode now gets cranky about override (or lack there of)	2018-02-27 10:46:21 -08:00
Rider Linden	b766466b30	Added settings inventory object with subtype	2018-02-26 09:27:14 -08:00
Rider Linden	7838189843	boost->std & same level interp	2018-02-06 17:27:56 -08:00
Rider Linden	0bf50e2f8c	Cleanup on daycyle selection and stack. Move blenders into environment. (Transition bronken, instant only. Shaddows moved based on region, not parcel)	2018-01-30 16:42:34 -08:00
Rider Linden	536aeb54a6	MAINT-8052: One more step towards parcel environments.	2018-01-23 17:34:25 -08:00
Rider Linden	1b8c2b5ebb	MAINT-8052: Initial support for new EEP cap	2018-01-23 08:54:34 -08:00
Rider Linden	8211f57205	MAINT-7699: Deliver new settings to viewer via cap	2018-01-08 15:10:25 -08:00
Rider Linden	d7dd10b88b	Split for viewer/simhost sync LLSD with simhost.	2017-11-30 11:32:22 -08:00

44 Commits (5bfe6f57ae6242a8a28839fe6f9a143f29a03bb1)