From 43765e5f5c16e40f460b4665f0ca8b8e3b5efb37 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 20 Jul 2015 18:21:29 +0200 Subject: [PATCH] FIRE-15962: Crash when flying under water using internal AO --- indra/newview/aoengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp index a63ede1456..277eb15c1f 100644 --- a/indra/newview/aoengine.cpp +++ b/indra/newview/aoengine.cpp @@ -481,7 +481,7 @@ const LLUUID AOEngine::override(const LLUUID& pMotion, BOOL start) << " of set " << mCurrentSet->getName() << " (" << mCurrentSet << ")" << LL_ENDL; - if (animation.notNull()) + if (animation.notNull() && state->mCurrentAnimation < state->mAnimations.size()) { mAnimationChangedSignal(state->mAnimations[state->mCurrentAnimation].mInventoryUUID); }