diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:05:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:05:53 -0400 |
| commit | d8be66c8e2dc979f7497841cd79fa6bd4172b4c8 (patch) | |
| tree | b5bf17211501903bf0c3dcc360052c50fbc8592f /indra/llcommon | |
| parent | 347015be33559ca035e1b119d361423b906555db (diff) | |
| parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
merge changes for 5.0.6-release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llassettype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h index 3a4b5dad18..b849be9f16 100644 --- a/indra/llcommon/llassettype.h +++ b/indra/llcommon/llassettype.h @@ -152,7 +152,7 @@ public: 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 protected: |