diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 632534417..aeaecb15d 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1432,7 +1432,7 @@ void LLAgentWearables::setWearableFinal( LLInventoryItem* new_item, LLWearable* const LLWearableType::EType type = new_wearable->getType(); // Replace the old wearable with a new one. - llassert( new_item->getAssetUUID() == new_wearable->getID() ); + llassert( new_item->getAssetUUID() == new_wearable->getAssetID() ); LLUUID old_item_id = mWearableEntry[ type ].mItemID; mWearableEntry[ type ].mItemID = new_item->getUUID(); mWearableEntry[ type ].mWearable = new_wearable; diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp index d64fcea84..1382d6e89 100644 --- a/indra/newview/llfloatercustomize.cpp +++ b/indra/newview/llfloatercustomize.cpp @@ -2694,7 +2694,7 @@ void LLFloaterCustomize::generateVisualParamHints(LLViewerJointMesh* joint_mesh, void LLFloaterCustomize::setWearable(LLWearableType::EType type, LLWearable* wearable, U32 perm_mask, BOOL is_complete) { - llassert( type < WT_COUNT ); + llassert( type < LLWearableType::WT_COUNT ); gSavedSettings.setU32("AvatarSex", (gAgentAvatarp->getSex() == SEX_MALE) ); LLPanelEditWearable* panel = mWearablePanelList[ type ]; diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 54b7f6729..66fdaa4c4 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -31,7 +31,6 @@ */ #include "llviewerprecompiledheaders.h" -indra/newview/llfloatertools.cpp #include "llfloatertools.h"