diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:07:14 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:07:14 -0800 |
| commit | 16202f5e00c6e95f6df56ed8924c2fcb13b4ef17 (patch) | |
| tree | f9579b40277f21f07a325ae9d59dd230c203bef1 /indra/newview/llresourcedata.h | |
| parent | 6ec038c0cad54f36d89678df63ae7526f5fb5bca (diff) | |
| parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) | |
merge
Diffstat (limited to 'indra/newview/llresourcedata.h')
| -rw-r--r-- | indra/newview/llresourcedata.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llresourcedata.h b/indra/newview/llresourcedata.h index 46b79150bb..b4b9042689 100644 --- a/indra/newview/llresourcedata.h +++ b/indra/newview/llresourcedata.h @@ -39,11 +39,12 @@ struct LLResourceData { LLAssetInfo mAssetInfo; - LLAssetType::EType mPreferredLocation; + LLFolderType::EType mPreferredLocation; LLInventoryType::EType mInventoryType; U32 mNextOwnerPerm; S32 mExpectedUploadCost; void *mUserData; + static const S8 INVALID_LOCATION = -2; }; #endif |