From ec97be1f667afff7cd5ee513ca5c36438d497ae6 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 19 Feb 2021 09:50:16 +0100
Subject: [PATCH] Don't try to create motions with null UUID

---
 indra/llcharacter/llmotioncontroller.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 43865d3ff0..93c5dac12a 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -347,6 +347,13 @@ void LLMotionController::removeMotionInstance(LLMotion* motionp)
 //-----------------------------------------------------------------------------
 LLMotion* LLMotionController::createMotion( const LLUUID &id )
 {
+	// <FS:Ansariel> Don't try to create invalid motions
+	if (id.isNull())
+	{
+		return NULL;
+	}
+	// </FS:Ansariel>
+
 	// do we have an instance of this motion for this character?
 	LLMotion *motion = findMotion(id);