diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-07-18 16:32:51 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-07-18 16:32:51 -0400 |
| commit | 1e845ee2a2ebc706050ccc3974fde99a5a4cd943 (patch) | |
| tree | 71075bd96ebae8cfadf4062972178c19dbb10ace /indra/newview/llappearancemgr.cpp | |
| parent | a1ece43905db86cb6953ce9848228122637e5708 (diff) | |
| parent | 47fabf5770bbb1b2f8272bb77ebdc993cda7c033 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index fc07932860..3818bd8aec 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2115,7 +2115,10 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions, return; } - llassert(validateClothingOrderingInfo()); + if (!validateClothingOrderingInfo()) + { + llwarns << "Clothing ordering error" << llendl; + } BoolSetter setIsInUpdateAppearanceFromCOF(mIsInUpdateAppearanceFromCOF); selfStartPhase("update_appearance_from_cof"); |