d9153532b8
Merge branch 'main' into marchcat/x-mf-merge
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
2024-05-15 12:51:21 +03:00
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
86c0c1d553
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-24 09:55:34 -07:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
bc93177ea0
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate ( #1258 )
...
* #1176 Somewhat working GLTF Node support for translate tool
* #1176 Missing file from last commit
* #1176 Better translation for rotated nodes.
* #1176 Fix for objects snapping back to original position
* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display
* #1176 Clean out some unused and not working functions.
* #1176 Fix for mac build, incidental cleanup
* Mac build fix
2024-04-17 16:12:49 -05:00
c87850ddab
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
2023-12-18 07:57:29 +02:00
1ffa0ce510
Merge branch 'main' into DRTVWR-599-maint-Z
2023-12-18 06:30:40 +02:00
5abcec163c
SL-20710 ignore pelvis fixup when sitting in mouselook
2023-12-12 18:29:55 +02:00
27dae1d967
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
8db118bbe7
SL-20430 Camera won't follow avatar above 1024m
...
Partially reverts SL-20206 commit 25388312cf
2023-10-09 21:05:54 +03:00
145a5ffe7f
SL-15039 Prune unused preferences #3
...
DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting
2023-09-22 19:28:23 +03:00
25388312cf
SL-20206 Underwater visuals problematic when camera is swung below Z=0
2023-09-05 13:24:54 +02:00
d08859f3f4
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
2023-08-23 22:28:01 +03:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
2531144643
SL-18399 'DisableCameraConstraints' debug setting is not working on RC
2023-07-28 10:36:00 +02:00
6f8b812ecd
SL-19692 Z Offset is applied twice in Mouselook
2023-06-21 15:08:10 +02:00
60d8647a32
SL-19602 Alt-Zoom overcompensates for z pelvis fixup
...
Alt zoom was pointing near ground instead of agent's actual position
2023-05-16 02:00:51 +03:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
200e185dff
SL-18857 FIXED Editing attachment before Shape can stop av turning for user
2022-12-16 17:27:38 +02:00
da373e66cb
mac build fix - remove unused variables
2022-12-13 18:10:26 +02:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
43de9f202e
Merge branch 'master' into DRTVWR-528
...
# Conflicts:
# indra/newview/llappviewer.cpp
2022-07-12 00:42:54 +03:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
3400e5fd30
SL-17284 Reflection probe tuning and optimization take 1
2022-05-16 17:21:08 +00:00
e24acd81e0
SL-16892 Fix crash at getCameraOffsetInitial
...
getCameraOffsetInitial() call can happen before init()
2022-02-21 21:31:19 +02:00
59fc1ce288
SL-10659 Sometimes selection particles misbehave when selecting Animesh
2021-08-31 18:12:22 +03:00
cf244c191e
SL-15848 FIXED Camera shaking when focused on terrain while avatar is in motion
2021-08-18 14:36:56 +03:00
176e56d3e8
SL-14885: Use LLCachedControl
2021-04-30 10:56:08 -07:00
d1875c4932
SL-14885 Allow mousewheel to zoom way out when user has disabled camera constraints
2021-04-30 08:57:48 -07:00
c2b55c4362
Merged master(DRTVWR-503) into DRTVWR-514-keymappings
2020-09-22 22:54:36 +03:00
c98bef9717
SL-13802 Avatar was turned into wrong direction when hitting esc
2020-08-19 00:05:38 +03:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
6364e2fff6
Merge branch 'master' into DRTVWR-460
2020-05-04 23:35:54 +03:00
74d6e6b65c
SL-12904 FIXED Camera Preset does not restore correctly when sitting
2020-04-20 14:27:22 +03:00
70d340a1bf
SL-12993 Focus on avatar after saving new preset
2020-04-13 20:02:58 +03:00
944b908be1
SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of Camera preset, not as separate setting
2020-04-10 18:38:56 +03:00
1f5bb7be28
SL-12904 FIXED Camera Preset does not restore correctly when sitting
2020-04-06 16:03:19 +03:00
2dde386917
SL-12927 FIXED [Camera Presets] when sitting pressing ESC key causes rotation
2020-04-02 15:32:04 +03:00
aefd01bd9c
SL-12904 FIXED Camera Preset does not restore correctly when sitting
2020-03-27 20:00:27 +02:00
3e403ffb4f
SL-4495 Add setting to ignore Hover height when setting Camera position
2020-03-16 17:48:23 +02:00
02dba611b2
SL-10326 Develop submenu option Allow Select Avatar was defective
...
Viewer should now filter out position changes from server when avatar is being edited.
2020-02-27 20:15:14 +02:00
2c7a8a2485
SL-12618 FIXED The camera zoom position is incorrect after selecting the preset in some cases
2020-01-30 17:51:41 +02:00
e865c94513
SL-12424 Use correct avatar position
2020-01-17 18:58:07 +02:00
fcbccd59d9
SL-12424 Allow saving offsets based on current camera position
2020-01-17 17:54:40 +02:00
b0265f9756
Merged in lindenlab/viewer-release
2019-12-13 02:21:48 +02:00
Andrey Lihatskiy