19347f7094
Fix merge issues:
...
* Restore changes from 21947778ba37586189491eeecfa1a8b9633c17e3f660f1f0fdb9633c17e398f7d73d4623729442aa
2025-04-10 23:51:36 +03:00
5d7a5001b4
Merge commit '9e24b30' into marchcat/maint-c/restore
...
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
2025-04-10 06:01:50 +03:00
3fc8d4b232
#1611 Regression in anti-flipping mechanism for mouselook camera
2024-06-15 00:18:49 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
dcb85f9f9d
Merge branch 'marchcat/w-whitespace' into release/maint-c
2024-05-15 12:07:29 +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
0d4f52b778
secondlife/viewer#1200 Avatar rotates 360 degrees when viewed from the top and below
2024-04-25 13:54:48 +02:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
8c16ec2b53
Convert BOOL to bool in LLControlGroup and related classes
2024-02-21 03:00:25 +02:00
da373e66cb
mac build fix - remove unused variables
2022-12-13 18:10:26 +02:00
5bfe93b4ea
SL-18159 Windows' mouse from keyboard emulation causes pointer to jump around the screen.
...
Emulated mouse was trigering "not a valid zoomable object" case and jumping to garbage mMouseDownX/Y due to 'up' event being too early.
2022-12-11 19:08:48 +02:00
e24acd81e0
SL-16892 Fix crash at getCameraOffsetInitial
...
getCameraOffsetInitial() call can happen before init()
2022-02-21 21:31:19 +02: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
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
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
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
f4d4fb2ad0
SL-12288 Enhancement for Rotate and Track camera controls
2019-11-22 14:34:20 +02:00
7637f34386
SL-12186 WIP Get rid of excessive offset settings as we moved to store data in xml
2019-11-13 17:39:40 +02:00
4778417f25
SL-12186 WIP Use appropriate offset names when saving presets
2019-11-13 15:55:02 +02:00
c75d443c83
SL-12186 WIP Updating UI for camera controls, including presets
2019-11-04 20:35:34 +02:00
dbb613a2d8
SL-11456 Allow scaling of HUD attachments
2019-07-02 16:52:21 +03:00
ac2fc3029f
Backout tabs v spaces changes.
...
'warn-on-failure:no-tabs'
2019-03-12 08:56:26 -07:00
3e56002245
Tabs -> spaces.
2019-03-11 08:11:09 -07:00
bd7ad9c157
Merge viewer-release
2018-08-02 23:02:42 +01:00
a902b360f2
MAINT-8478 Unable to unzoom camera after zooming object behind draw distance
2018-06-06 12:10:57 +00:00
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
71babaf882
MAINT-147 FIXED Allow follow cam scripts after closing Build tools floater.
2015-03-10 11:29:17 +02:00
7932a77319
MAINT-3885 FIXED Don't set focus on avatar after double-click-teleport if camera was locked.
2014-07-01 11:01:43 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
e8a52ebc51
EXT-8148 Camera transitions are occasionally very slow for appearance editing transitions
...
reviewed by Nyx
2010-07-01 10:33:06 -07:00
742c123879
EXT-8071 FIX Viewer crashes in login screen when moving mousewheel in login fields.
2010-06-25 10:37:08 -07:00
6dd35018d2
EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
...
added some comments and cleaned up code based on review
2010-06-23 18:32:31 -07:00
0aabcc8134
EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
2010-06-23 16:50:06 -07:00
8b95793c35
EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation so much
...
also, made camera default target and offset live-settable for debugging
reviewed by vir
2010-06-15 13:53:40 -07:00
fb08c17cdd
Checker: UNINIT_CTOR
...
Function: LLAgentCamera::LLAgentCamera()
File: /indra/newview/llagentcamera.cpp
2010-04-01 17:25:42 +01:00
56dbd313a1
Checker: CHECKED_RETURN
...
Function: LLAgentCamera::updateCamera()
File: /indra/newview/llagentcamera.cpp
not a bug, but I cleaned up BOOL->bool
2010-04-01 17:23:49 +01:00
715e38fb53
EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into llagentcamera
...
Fix for S32/F32 mismatch.
2010-03-30 16:01:17 -04:00
7a8c6a235e
EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include cleanup
...
Took out unnecessary #includes from llagentcamera.*
2010-03-30 15:05:48 -04:00
b15e34b942
EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into llagentcamera
...
Orbit/Pan keys were already in llagentcamera. Pulled alt/walk/left/up/yaw/pitch into llagentcamera.
2010-03-30 14:21:20 -04:00
0bcfbde3a4
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26 13:58:19 -04:00
853d9e4453
EXT-6539 : Take out mAvatarObject from LLAgentWearables
...
Removed mAvatarObject / gAgentWearables.mAvatarObject since it's redundant with gAgent.mAvatarObject.
2010-03-25 17:27:50 -04:00
504cf0870d
EXT-2959 : Pull out camera functions from llagent to llagentcamera
...
#3 checkin.
Took out llagent "friend llagentcamera" and added accessors instead.
Did some superficial formatting cleanup.
2010-03-25 15:06:48 -04:00
cc4a9b5640
EXT-2959 : Pull out camera functions from llagent to llagentcamera
...
#2 checkin.
Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-24 16:12:01 -04:00
Ansariel