diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-04-11 21:59:38 +0200 |
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-04-11 21:59:38 +0200 |
| commit | d0102af56d3b1d5b1d9bf3c8eb9aeea77028b70e (patch) | |
| tree | e31cee85f651a874c4b6edc7491efa0cb2ec93d5 /indra/llmessage/partsyspacket.h | |
| parent | 17e1f3692c5c1e9cbc6ba6895b312a8baae9aec2 (diff) | |
| parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) | |
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
Diffstat (limited to 'indra/llmessage/partsyspacket.h')
| -rw-r--r-- | indra/llmessage/partsyspacket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/partsyspacket.h b/indra/llmessage/partsyspacket.h index 0a8e433cbd..76c6b3e202 100644 --- a/indra/llmessage/partsyspacket.h +++ b/indra/llmessage/partsyspacket.h @@ -102,7 +102,7 @@ struct LLPartInitData { //How much of an effect does gravity have F32 globalLifetime; //If particles re-spawn, a system can exist forever. - //If (ActionFlags & PART_SYS_GLOBAL_DIE) is TRUE this variable is used to determine how long the system lasts. + //If (ActionFlags & PART_SYS_GLOBAL_DIE) is true this variable is used to determine how long the system lasts. F32 individualLifetime; //How long does each particle last if nothing else happens to it F32 individualLifetimeRange; @@ -132,7 +132,7 @@ const int PART_SYS_SLOW_ANIM_BYTE = 0; // slow animation down by a factor of 10 const int PART_SYS_SLOW_ANIM_BIT = 1; // useful for tweaking anims during debugging const int PART_SYS_FOLLOW_VEL_BYTE = 0; // indicates whether to orient sprites towards -const int PART_SYS_FOLLOW_VEL_BIT = 4; // their velocity vector -- default is FALSE +const int PART_SYS_FOLLOW_VEL_BIT = 4; // their velocity vector -- default is false const int PART_SYS_IS_LIGHT_BYTE = 0; // indicates whether a particular particle system const int PART_SYS_IS_LIGHT_BIT = 8; // is also a light object -- for andrew |