diff options
| author | Richard Linden <none@none> | 2012-01-23 17:50:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-23 17:50:15 -0800 |
| commit | ff5fe4ffc06fa9220043d82a2d7d7dbc0b7ffd77 (patch) | |
| tree | f6b31777ceb1a66c81aa7322687a9068fbd6a3b9 /indra/newview/llagentwearables.cpp | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
| parent | e09661f6ec467ea98715a2a04db40fc4e6b7ce02 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 13b62cb019..dd7e509e8d 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -816,7 +816,10 @@ void LLAgentWearables::popWearable(const LLWearableType::EType type, U32 index) if (wearable) { mWearableDatas[type].erase(mWearableDatas[type].begin() + index); - gAgentAvatarp->wearableUpdated(wearable->getType(), TRUE); + if (isAgentAvatarValid()) + { + gAgentAvatarp->wearableUpdated(wearable->getType(), TRUE); + } wearable->setLabelUpdated(); } } |