diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-06-20 23:16:03 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-06-20 23:16:03 +0300 |
| commit | 270cd8ff15d01ff9e2f390ae442e9f5de2b5adec (patch) | |
| tree | dcd736ad4cd7db0e299e2542d3c8ad58b43d906e /indra/llcommon | |
| parent | 21f22ced4ddf10afcbe0fae299a24b3ceb01d1de (diff) | |
| parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llassettype.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llerror.cpp | 2 |
2 files changed, 2 insertions, 2 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: diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index e6407ecf22..9c49f7eff4 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -572,7 +572,7 @@ namespace LLError mFunctionString += std::string(mFunction) + ":"; for (size_t i = 0; i < mTagCount; i++) { - mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : ","); + mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? " " : ","); } } |