diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp
index 5da6890f4..2a9292dff 100644
--- a/indra/lscript/lscript_library/lscript_library.cpp
+++ b/indra/lscript/lscript_library/lscript_library.cpp
@@ -199,6 +199,8 @@ void LLScriptLibrary::init()
 	addFunction(10.f, 0.f, dummy_func, "llStringLength", "i", "s");
 	addFunction(10.f, 0.f, dummy_func, "llStartAnimation", NULL, "s");
 	addFunction(10.f, 0.f, dummy_func, "llStopAnimation", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "llStartObjectAnimation", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "llStopObjectAnimation", NULL, "s");
 	addFunction(10.f, 0.f, dummy_func, "llPointAt", NULL, "v");
 	addFunction(10.f, 0.f, dummy_func, "llStopPointAt", NULL, NULL);
 	addFunction(10.f, 0.f, dummy_func, "llTargetOmega", NULL, "vff");
diff --git a/indra/newview/app_settings/dictionaries/en_sl.dic b/indra/newview/app_settings/dictionaries/en_sl.dic
index 0f25bd233..c2ab72088 100644
--- a/indra/newview/app_settings/dictionaries/en_sl.dic
+++ b/indra/newview/app_settings/dictionaries/en_sl.dic
@@ -730,6 +730,8 @@ llRotLookAt
 llStringLength
 llStartAnimation
 llStopAnimation
+llStartObjectAnimation
+llStopObjectAnimation
 llPointAt
 llStopPointAt
 llTargetOmega
diff --git a/indra/newview/app_settings/lsl_functions_sl.xml b/indra/newview/app_settings/lsl_functions_sl.xml
index 8780e774c..7799b74a4 100644
--- a/indra/newview/app_settings/lsl_functions_sl.xml
+++ b/indra/newview/app_settings/lsl_functions_sl.xml
@@ -305,6 +305,10 @@
    <map/>
    <key>llStopAnimation</key>
    <map/>
+   <key>llStartObjectAnimation</key>
+   <map/>
+   <key>llStopObjectAnimation</key>
+   <map/>
    <key>llPointAt</key>
    <map/>
    <key>llStopPointAt</key>
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 8378aa8e8..d4378a093 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -957,6 +957,14 @@ Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the
 llStopAnimation(string anim)
 Stops animation anim for agent that granted permission
 	</string>
+  <string name="LSLTipText_llStartObjectAnimation">
+llStartObjectAnimation(string anim)
+Start animation for the current object
+  </string>
+  <string name="LSLTipText_llStopObjectAnimation">
+llStopObjectAnimation(string anim)
+Stop an animation for the current object
+  </string>
 	<string name="LSLTipText_llPointAt">
 llPointAt(vector pos)
 Makes agent that owns object point at pos