diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-06 15:28:31 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-06 15:28:31 +0300 |
| commit | 6eef4d70d7b53216bc2e7e463bf9108447de9d55 (patch) | |
| tree | c692881e840069b3932579ca91448f79b54d5b43 /indra/newview/llappearancemgr.cpp | |
| parent | f92e50c54246add3afc752f86f072b23bdb2e5ad (diff) | |
| parent | a1bbba2be64daf332bdf511129b1ec4f2bea1540 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 8ef3fa200b..17efc28a6a 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2590,7 +2590,7 @@ void LLAppearanceMgr::dumpItemArray(const LLInventoryModel::item_array_t& items, { asset_id = linked_item->getAssetUUID(); } - llinfos << msg << " " << i <<" " << item->getName() << " " << asset_id.asString() << llendl; + llinfos << msg << " " << i <<" " << (item ? item->getName() : "(nullitem)") << " " << asset_id.asString() << llendl; } llinfos << llendl; } |