summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.h
AgeCommit message (Collapse)Author
10 daysFix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp
11 daysMerge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# 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
2024-06-15#1611 Regression in anti-flipping mechanism for mouselook cameraAlexander Gavriliuk
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-15Merge branch 'marchcat/w-whitespace' into release/maint-cAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-25secondlife/viewer#1200 Avatar rotates 360 degrees when viewed from the top ↵Alexander Gavriliuk
and below
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in LLControlGroup and related classesAnsariel
2022-12-13mac build fix - remove unused variablesMaxim Nikolenko
2022-12-11SL-18159 Windows' mouse from keyboard emulation causes pointer to jump ↵akleshchev
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-02-21SL-16892 Fix crash at getCameraOffsetInitialAndrey Kleshchev
getCameraOffsetInitial() call can happen before init()
2020-04-20SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-04-13SL-12993 Focus on avatar after saving new presetMnikolenko Productengine
2020-04-10SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of ↵Mnikolenko Productengine
Camera preset, not as separate setting
2020-03-27SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-03-16SL-4495 Add setting to ignore Hover height when setting Camera positionmaxim_productengine
2020-01-30SL-12618 FIXED The camera zoom position is incorrect after selecting the ↵maxim_productengine
preset in some cases
2020-01-17SL-12424 Allow saving offsets based on current camera positionmaxim_productengine
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-22SL-12288 Enhancement for Rotate and Track camera controlsmaxim_productengine
2019-11-13SL-12186 WIP Get rid of excessive offset settings as we moved to store data ↵maxim_productengine
in xml
2019-11-13SL-12186 WIP Use appropriate offset names when saving presetsmaxim_productengine
2019-11-04SL-12186 WIP Updating UI for camera controls, including presetsMnikolenko Productengine
2019-07-02SL-11456 Allow scaling of HUD attachmentsmaxim_productengine
2019-03-12Backout tabs v spaces changes.Graham Linden
'warn-on-failure:no-tabs'
2019-03-11Tabs -> spaces.Graham Linden
2018-08-02Merge viewer-releaseGraham Linden
2018-06-06MAINT-8478 Unable to unzoom camera after zooming object behind draw distanceAndrey Kleshchev
2017-02-23STORM-2145 Camera Presets -- some initial workJonathan Yap
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-03-10MAINT-147 FIXED Allow follow cam scripts after closing Build tools floater.Mnikolenko ProductEngine
2014-07-01MAINT-3885 FIXED Don't set focus on avatar after double-click-teleport if ↵Mnikolenko ProductEngine
camera was locked.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-01EXT-8148 Camera transitions are occasionally very slow for appearance ↵Richard Linden
editing transitions reviewed by Nyx
2010-06-25EXT-8071 FIX Viewer crashes in login screen when moving mousewheel in login ↵Richard Nelson
fields.
2010-06-23EXT-7767 FIX Outfit editor doesn't appear to have a default camera viewRichard Nelson
added some comments and cleaned up code based on review
2010-06-23EXT-7767 FIX Outfit editor doesn't appear to have a default camera viewRichard Nelson
2010-06-15EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation ↵Richard Linden
so much also, made camera default target and offset live-settable for debugging reviewed by vir
2010-04-01Checker: UNINIT_CTORTofu Linden
Function: LLAgentCamera::LLAgentCamera() File: /indra/newview/llagentcamera.cpp
2010-04-01Checker: CHECKED_RETURNTofu Linden
Function: LLAgentCamera::updateCamera() File: /indra/newview/llagentcamera.cpp not a bug, but I cleaned up BOOL->bool
2010-03-30EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into ↵Loren Shih
llagentcamera Fix for S32/F32 mismatch.
2010-03-30EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include ↵Loren Shih
cleanup Took out unnecessary #includes from llagentcamera.*
2010-03-30EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into ↵Loren Shih
llagentcamera Orbit/Pan keys were already in llagentcamera. Pulled alt/walk/left/up/yaw/pitch into llagentcamera.
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Lots of superficial cleanup, particularly around "if (" formatting. Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-25EXT-6539 : Take out mAvatarObject from LLAgentWearablesLoren Shih
Removed mAvatarObject / gAgentWearables.mAvatarObject since it's redundant with gAgent.mAvatarObject.
2010-03-25EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#3 checkin. Took out llagent "friend llagentcamera" and added accessors instead. Did some superficial formatting cleanup.
2010-03-24EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#2 checkin. Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).