diff options
author | Anchor Linden <anchor@lindenlab.com> | 2018-10-11 10:54:16 -0700 |
---|---|---|
committer | Anchor Linden <anchor@lindenlab.com> | 2018-10-11 10:54:16 -0700 |
commit | 076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (patch) | |
tree | 58e7cd0674a1286544f883257cc2f43969ea201f /indra/llinventory | |
parent | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (diff) | |
parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) |
Merge
Diffstat (limited to 'indra/llinventory')
-rw-r--r-- | indra/llinventory/llinventorytype.cpp | 2 | ||||
-rw-r--r-- | indra/llinventory/llinventorytype.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp index d1e6807f52..7399e1bca4 100644 --- a/indra/llinventory/llinventorytype.cpp +++ b/indra/llinventory/llinventorytype.cpp @@ -181,7 +181,7 @@ LLInventoryType::EType LLInventoryType::defaultForAssetType(LLAssetType::EType a } else { - return IT_NONE; + return IT_UNKNOWN; } } diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h index 691acee9cd..034cee5f45 100644 --- a/indra/llinventory/llinventorytype.h +++ b/indra/llinventory/llinventorytype.h @@ -66,6 +66,7 @@ public: IT_PERSON = 24, IT_COUNT = 25, + IT_UNKNOWN = 255, IT_NONE = -1 }; @@ -112,6 +113,7 @@ public: ICONNAME_MESH, ICONNAME_INVALID, + ICONNAME_UNKNOWN, ICONNAME_COUNT, ICONNAME_NONE = -1 }; |