Commit Graph

37 Commits (b49c3a083b73f6a5762f353f618a2e1fe25cf690)

Author SHA1 Message Date
Ansariel 8da32f68dc Make AO not only remember current set name, but also current animation for each state 2025-11-30 16:23:22 +01:00
chanayane 664f8178ac
fix crash when double-clicking animation in a different state than active state 2025-01-30 00:27:20 +01:00
chanayane 656e910db8
Double click on animation in AO 2025-01-28 01:34:19 +01:00
Ansariel 0ecfbc3de9 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llappearance/llwearable.cpp
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
#	indra/newview/llimpanel.cpp
#	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/llpaneleditwearable.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	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/llviewermenu.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
2024-05-16 14:10:55 +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
Ansariel 9a044f4a52 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.cpp
#	indra/llappearance/llavatarappearance.h
#	indra/llappearance/lldriverparam.h
#	indra/llappearance/llviewervisualparam.cpp
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llcharacter/llcharacter.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llpanelnearbymedia.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2024-02-13 00:54:24 +01:00
Zi Ree c801eb7678 FIRE-33414 - fix animation overrider not being able to add animations to empty states 2023-11-29 22:42:56 +01:00
Zi Ree f4fb4cdb75 FIRE-33384 - Fix notecard import for animation overrider 2023-11-23 00:25:06 +01:00
Ansariel 2180c2a443 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorymodelbackgroundfetch.h
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-03-20 18:15:38 +01:00
Zi Ree d6b7227b2e Better way to make the AO start up correctly, also fixes stuck transient animations since the last changes 2021-11-24 06:10:12 +01:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Zi Ree 57a1365eda FIRE-24160 FIRE-9305 Show AO enabled/disabled messages in local chat where appropriate, don't allow scripts to enable the AO when it was disabled before, scripts can only pause the AO/AO stands, not disable them for good. 2021-02-07 00:55:12 +01:00
Ansariel 2a997d6edc More possible crash fixes in internal AO plus additional refactoring 2020-10-25 14:00:40 +01:00
Ansariel f9d8467d1e Crash fixes for internal AO contributed by Rye Mutt plus some additional minor refactoring 2020-10-25 05:05:10 +01:00
ziree 01c69e2b20 Several AO fixes for sitting, smart sit and region crossing - FIRE-15059, FIRE-16230, FIRE-22471 2019-10-26 16:24:49 +02:00
ziree 8a476035ec Make linden water transition for FS AO more robust, add some safety checks for stuck animations - FIRE-6605 FIRE-15350 FIRE-21937 FIRE-8099 possibly FIRE-14925 2019-10-20 16:44:47 +02:00
Tonya Souther 5d0704e36c FIRE-23155: Allow the LSL bridge AO interface to only disable stand animations 2019-06-16 13:18:34 -05:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Ansariel fc971a2c8f Housekeeping... 2015-02-27 12:52:40 +01:00
Ansariel 470a273529 Disconnect from region change callback if AOEngine gets destroyed 2014-07-25 07:53:23 +02:00
Ansariel 54dad8b4d1 Optimize this too! 2014-07-11 15:23:24 +02:00
ziree 24e212359f Added displaying the currently playing AO animation in bold in the AO list. FIRE-2302 2014-05-07 00:54:20 +02:00
ziree 5c6908de1c Proposed fix for AO animations stopping on region crossing. FIRE-4832 2014-05-06 15:29:27 +02:00
Ansariel 7abcf40dec Fixed some Firestorm license headers 2013-03-06 14:07:56 +01:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
ziree 2177f87a1b Making AO less aggressive with purging folders and items. Fixes FIRE-5524 2012-03-29 16:50:17 +02:00
ziree 0002a87afb Make animation overrider react correctly when the UseAO control changes. 2012-02-01 14:19:38 +01:00
ziree 55ee628490 Smart AO got confused with animations running from attachments or objects other than the seat. Fixes FIRE-3896 2012-01-12 15:58:11 +01:00
ziree 36225fb9e0 AO cleanup. const references are good. 2012-01-12 14:56:55 +01:00
Nicky ecdd676e72 FIRE-3801; Crash on AO import; Do not delete AOSets during timer events. 2011-11-03 15:41:17 +01:00
ZiRee 48ab6939d7 Crash fix, added accessor for AO folder for later inventory protection 2011-04-26 21:36:00 +02:00
ZiRee f343623f0f Rename AO sets finished, some better UI handling for checking of names and reloading sets. 2011-04-26 18:08:09 +02:00
ZiRee 34e0f4b534 Fixed reapplying cycle time after typing 2011-04-26 01:49:28 +02:00
ZiRee 03b24043f7 Animation switchover to swimming when avatar goes under water. 2011-04-25 07:27:58 +02:00
ZiRee 91c0ad6d08 Added option to turn animation cycling off altogether, so only manual cycling changes the animation for a state. 2011-04-21 22:13:41 +02:00
ZiRee 083d94821e Smart sit override enable/disable, fix for options only taking effect immediately when editing the currently used set. 2011-04-20 21:38:32 +02:00
ZiRee 54f218f68a First draft for a viewer side animation overrider. Still very rough code but almost feature-complete. 2011-04-20 05:41:33 +02:00