diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:21:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:21:19 +0300 |
| commit | 6ce9daa13d87fadc03d9ccd819a3e9b3f8748d8d (patch) | |
| tree | aca982dba1eed0485bf7153165b30cd4774987aa /indra/newview/rlvhelper.h | |
| parent | e8d33a8b5b06b70b6354672b6d426e82a8aed578 (diff) | |
| parent | 15908fd34e6d7a40f1d21e9f83676429818f2f06 (diff) | |
Merge commit '15908fd34e' into marchcat/c-develop
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/llappviewer.cpp
# indra/newview/llconversationlog.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/newview/rlvhelper.h')
| -rw-r--r-- | indra/newview/rlvhelper.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h index f241332594..f0ce35b816 100644 --- a/indra/newview/rlvhelper.h +++ b/indra/newview/rlvhelper.h @@ -49,12 +49,12 @@ namespace Rlv enum EBehaviourFlags : uint32_t { // General behaviour flags - Strict = 0x0001, // Behaviour has a "_sec" version - Synonym = 0x0002, // Behaviour is a synonym of another - Extended = 0x0004, // Behaviour is part of the RLVa extended command set - Experimental = 0x0008, // Behaviour is part of the RLVa experimental command set - Blocked = 0x0010, // Behaviour is blocked - Deprecated = 0x0020, // Behaviour is deprecated + Strict = 0x0001, // Behaviour has a "_sec" version + Synonym = 0x0002, // Behaviour is a synonym of another + Extended = 0x0004, // Behaviour is part of the RLVa extended command set + Experimental = 0x0008, // Behaviour is part of the RLVa experimental command set + Blocked = 0x0010, // Behaviour is blocked + Deprecated = 0x0020, // Behaviour is deprecated MaskGeneral = 0x0FFF, // Force-wear specific flags @@ -175,7 +175,7 @@ namespace Rlv template<EBehaviour templBhvr> using ReplyHandler = CommandHandler<EParamType::Reply, templBhvr>; // List of shared handlers - using VersionReplyHandler = ReplyHandler<EBehaviour::Version>; // Shared between @version and @versionnew + using VersionReplyHandler = ReplyHandler<EBehaviour::Version>; // Shared between @version and @versionnew // // CommandProcessor - Templated glue class that brings BehaviourInfo, CommandHandlerBaseImpl and CommandHandler together |