summaryrefslogtreecommitdiff
path: root/indra/llcommon/llassettype.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-01 10:44:07 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-01 10:44:07 -0400
commit045fb061376b25597b69d8043429d0fa25790c90 (patch)
tree6396df681e38b766f24d870f694924310042f448 /indra/llcommon/llassettype.h
parent1e8375571526c0275ef0d5dcc4860df9cdd8b68b (diff)
parent97f9dbee2ccd32b666c14bd79111bc2dbe2523e2 (diff)
automated merge
Diffstat (limited to 'indra/llcommon/llassettype.h')
-rw-r--r--indra/llcommon/llassettype.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index 4440e1bac3..2c2dc27aaa 100644
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -143,11 +143,11 @@ public:
static EType getType(const std::string& desc_name);
static const std::string& getDesc(EType asset_type);
- static BOOL lookupCanLink(EType asset_type);
- static BOOL lookupIsLinkType(EType asset_type);
+ static bool lookupCanLink(EType asset_type);
+ static bool lookupIsLinkType(EType asset_type);
- static BOOL lookupIsAssetFetchByIDAllowed(EType asset_type); // the asset allows direct download
- static BOOL lookupIsAssetIDKnowable(EType asset_type); // asset data can be known by the viewer
+ static bool lookupIsAssetFetchByIDAllowed(EType asset_type); // the asset allows direct download
+ static bool lookupIsAssetIDKnowable(EType asset_type); // asset data can be known by the viewer
static const std::string& badLookup(); // error string when a lookup fails