summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-02-27 09:03:04 -0500
committerOz Linden <oz@lindenlab.com>2015-02-27 09:03:04 -0500
commit83851db09ab0fecbb6722826055a55844fd98ea6 (patch)
treeb3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/newview/llvoavatar.cpp
parentbdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff)
parentd4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff)
merge up to 3.7.25-release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 85c60a74cc..f355e10c02 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4946,6 +4946,15 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
}
//-----------------------------------------------------------------------------
+// hasMotionFromSource()
+//-----------------------------------------------------------------------------
+// virtual
+bool LLVOAvatar::hasMotionFromSource(const LLUUID& source_id)
+{
+ return false;
+}
+
+//-----------------------------------------------------------------------------
// stopMotionFromSource()
//-----------------------------------------------------------------------------
// virtual