diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-14 16:03:04 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-14 16:03:04 +0300 |
| commit | 5702f0ea7365b23ac1ee95e15a0fedc9d36ccc09 (patch) | |
| tree | c20f233ea57455d26b4a831d2e97b5eb5b4dad8d /indra/newview/llwearable.cpp | |
| parent | 61316403aa7cd430d4bffac8ae517e5563598898 (diff) | |
| parent | a5f365c331149b03366be421aa1597dfbcb1bb33 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 25ddf2c4bb..3ecd1296bd 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -88,7 +88,7 @@ static std::string asset_id_to_filename(const LLUUID &asset_id); LLWearable::LLWearable(const LLTransactionID& transaction_id) : mDefinitionVersion(LLWearable::sCurrentDefinitionVersion), - mType(LLWearableType::WT_NONE) + mType(LLWearableType::WT_INVALID) { mTransactionID = transaction_id; mAssetID = mTransactionID.makeAssetID(gAgent.getSecureSessionID()); @@ -96,7 +96,7 @@ LLWearable::LLWearable(const LLTransactionID& transaction_id) : LLWearable::LLWearable(const LLAssetID& asset_id) : mDefinitionVersion( LLWearable::sCurrentDefinitionVersion ), - mType(LLWearableType::WT_NONE) + mType(LLWearableType::WT_INVALID) { mAssetID = asset_id; mTransactionID.setNull(); |