Commit Graph

91 Commits (d65de99052d5ff08c7c4290a1f1b8e396105b8af)

Author SHA1 Message Date
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 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
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
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
Alexander Gavriliuk f815b015ce secondlife/jira-archive-internal#69593 Avatar is upside down when viewed from below 2024-03-26 19:06:30 +01:00
Alexander Gavriliuk 61935a13f4 Add Develop menu option 'Debug Camera Controls' 2024-03-22 16:41:41 +01:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Andrey Kleshchev 9a36c1ac21 SL-15407 The previous view mode is not highlighted on the 'Camera controls' 2021-06-17 21:55:50 +03:00
Mnikolenko Productengine 0c9e8dddc8 SL-13731 FIXED Issue with selecting custom preset while in 'Object view' mode 2020-08-11 20:50:57 +03:00
Mnikolenko Productengine 2ea5c5986a SL-12904 Temporarily use LLSD to avoid crashes on older viewers 2020-04-23 13:22:27 +03:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Mnikolenko Productengine 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
Mnikolenko Productengine 3bac0d4283 SL-12991 [Camera Presets] Sort all Camera preset lists in the same way 2020-04-07 19:15:40 +03:00
Andrey Lihatskiy afd45506c1 SL-12792 Made "save as a new preset" a default option 2020-03-04 05:31:22 +02:00
Mnikolenko Productengine a2f0fd64e9 SL-12510 Revert changes and separate 'Save Graphic Preset' floater 2020-01-08 18:14:21 +02:00
maxim_productengine abd5277a7b SL-12424 WIP Save mousewheel zoom fraction in preset 2019-12-18 11:26:22 +02:00
maxim_productengine 5f86203f26 SL-12429 Use different setting name to prevent crash on old viewer 2019-12-10 15:44:01 +02:00
maxim_productengine 8d94e2af12 SL-12186 Update camera controls if preset was selected from the pulldown menu 2019-11-26 17:36:14 +02:00
AndreyL ProductEngine 4b261a90ae Merged in lindenlab/viewer-release 2019-11-14 23:46:15 +02:00
maxim_productengine 382c184501 SL-12186 WIP Added ability to reset default presets and updated item list in 'My camera presets' floater 2019-11-12 16:26:34 +02:00
maxim_productengine 1fa0b3fe95 SL-12186 WIP Add new 'My camera presets' floater 2019-11-08 17:57:17 +02:00
maxim_productengine dd8128114c SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset' floaters 2019-11-08 17:31:59 +02:00
Mnikolenko Productengine c75d443c83 SL-12186 WIP Updating UI for camera controls, including presets 2019-11-04 20:35:34 +02:00
andreykproductengine 2672093429 DRTVWR-493 LLHint to singleton 2019-06-20 20:03:47 +03:00
Graham Linden ac2fc3029f Backout tabs v spaces changes.
'warn-on-failure:no-tabs'
2019-03-12 08:56:26 -07:00
Graham Linden 3e56002245 Tabs -> spaces. 2019-03-11 08:11:09 -07:00
Jonathan Yap bff875d25f STORM-2145 Camera controls opacity is now working 2018-02-02 10:39:59 -05:00
Jonathan Yap 98792b9363 STORM-2145 Split move and view panels 2018-01-30 10:45:08 -05:00
Jonathan Yap 5c4ae5b11a STORM-2145 Camera Presets -- some initial work 2017-02-23 17:50:36 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Mnikolenko ProductEngine 0a32de770d MAINT-1871 FIXED Don't allow moving avatar while changing camera position. 2014-12-03 11:58:41 +02:00
callum_linden bdce32a02b Update to build on Xcode 6.0: collection of removal of unused variables [-Wunused-variable] 2014-10-18 11:56:23 -07:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
maxim_productengine 1c4a3e2ef3 MAINT-1118 FIXED Change panel mode before closing floater 2012-08-09 17:54:33 +03:00
Richard Linden 0323a37ac6 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-11-29 23:54:00 -08:00
Vadim ProductEngine f2f90b6ed8 EXP-1636 FIXED Extend menubar label changes to floater titles and FUI button labels. 2011-11-30 08:03:20 +02:00
Richard Linden b6858df0dd LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and LLHandle<Base>
can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
2011-11-08 13:47:08 -08:00
Richard Linden 30527b2206 EXP-1409 FIX WASD controls don't move avatar while Move floater is in focus
moved "chrome" flags to xui
separated hiding floater title from setting chrome
toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
2011-10-18 14:09:52 -07:00
Richard Linden 591ad2bde7 EXP-1403 FIX View floater options do not function 2011-10-18 12:20:36 -07:00
Leslie Linden f9e900f5ac * New floater positioning code. Better than what's checked in but not great.
* Floater updates for positioning and to revert some earlier string changes.
2011-10-11 17:36:23 -07:00
Paul ProductEngine 8154c245dd EXP-1281 FIXED (As a FUI user, I want all bottom bar floaters to become independent)
Made bottom bar dependent floaters independent from it. Also some LLTransientDockableFloaters are just LLFLoaters now.

Note: IM Floater and SysWellWindow will be made independent within EXP-1276
2011-10-11 18:14:37 +02:00
Richard Linden ca2141ce90 merge with viewer-dev 2010-12-08 16:04:07 -08:00
Vadim ProductEngine e03e3257ab STORM-730 FIXED Made Movement Controls, Camera Controls and Nearby Voice floaters use active floater transparency. 2010-12-06 19:19:31 +02:00
callum 6c7c124f43 Viewer changes for EXP-202 Close View hint when user interacts with the View tools - pan or zoom 2010-10-12 12:08:36 -07:00
Richard Nelson 7c256e5a13 EXP-166 FIXED Front an Side Preset Views not accessible in Skylight viewer 2010-10-11 15:48:36 -07:00
Richard Nelson 01b28ddf5d EXP-156 WIP Implement custom Skylight hints 2010-10-06 20:10:36 -07:00
Richard Linden 51ad14db88 moved callback registration to class that implements it 2010-09-28 17:13:50 -07:00