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 |
|
Ansariel
|
088cc2ea35
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-09 02:25:42 +02: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
|
a08e50354f
|
FIRE-33300 - FS AO doesn't load animations on login
|
2023-12-02 07:54:55 +01:00 |
|
Ansariel
|
49e44d817b
|
Random changes just for our leecher friends :)
|
2023-11-02 21:54:18 +01:00 |
|
Ansariel
|
2a997d6edc
|
More possible crash fixes in internal AO plus additional refactoring
|
2020-10-25 14:00:40 +01:00 |
|
Ansariel
|
fc971a2c8f
|
Housekeeping...
|
2015-02-27 12:52:40 +01:00 |
|
ziree
|
26e1c72ba7
|
Fix avatar unable to stand when switching off AO during ground sit override. FIRE-13663
|
2014-05-11 22:29:21 +02:00 |
|
Ansariel
|
22cf771ce4
|
Replace legacy logging macros in the AO classes while already poking at it
|
2014-02-03 18:00:38 +01:00 |
|
Ansariel
|
7abcf40dec
|
Fixed some Firestorm license headers
|
2013-03-06 14:07:56 +01:00 |
|
ziree
|
36225fb9e0
|
AO cleanup. const references are good.
|
2012-01-12 14:56:55 +01:00 |
|
ZiRee
|
75d2bba965
|
Added ORACUL import
|
2011-04-24 18:43:46 +02:00 |
|
ZiRee
|
f7027358f6
|
Fix uninitialized index member variable.
|
2011-04-22 01:31:44 +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
|
5542c33b78
|
Fixed transient animations not causing the avatar to get stuck.
|
2011-04-21 17:05:18 +02:00 |
|
ZiRee
|
d71f7ebc7b
|
Floater minimum width fixed, small message cleanup.
|
2011-04-21 00:35:14 +02:00 |
|
ZiRee
|
bcfc40dd33
|
Cleanup debugging messages continued.
|
2011-04-21 00:15:46 +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 |