diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-03 00:47:23 +0000 | 
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-03 00:47:23 +0000 | 
| commit | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (patch) | |
| tree | 54de76637c610b85957197c9218d77e3c8212f00 /indra/llmessage | |
| parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089   svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Infrastructure changes for cleaning up Asset/Folder types.  Associated sim changes are only so that the sim still compiles.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/lltransfersourceasset.cpp | 2 | 
1 files changed, 0 insertions, 2 deletions
| diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp index 5a1cd95ffc..7332f5c954 100644 --- a/indra/llmessage/lltransfersourceasset.cpp +++ b/indra/llmessage/lltransfersourceasset.cpp @@ -270,7 +270,6 @@ bool is_asset_fetch_by_id_allowed(LLAssetType::EType type)  		case LLAssetType::AT_BODYPART:  		case LLAssetType::AT_ANIMATION:  		case LLAssetType::AT_GESTURE: -		case LLAssetType::AT_FAVORITE:  			rv = true;  			break;  		default: @@ -293,7 +292,6 @@ bool is_asset_id_knowable(LLAssetType::EType type)  		case LLAssetType::AT_BODYPART:  		case LLAssetType::AT_ANIMATION:  		case LLAssetType::AT_GESTURE: -		case LLAssetType::AT_FAVORITE:  		case LLAssetType::AT_LINK:  		case LLAssetType::AT_LINK_FOLDER:  			rv = true; | 
