From 7a82030c642ffb0d3cd3f8e42b65addab9b776fc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 25 Apr 2010 18:29:36 -0700
Subject: Fixed animation list

---
 linden/indra/newview/llstartup.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 9073874..9a6e6a0 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -186,6 +186,8 @@
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
 
+#include "jcfloater_animation_list.h"
+
 #if LL_LIBXUL_ENABLED
 #include "llmozlib.h"
 #endif // LL_LIBXUL_ENABLED
@@ -3196,6 +3198,13 @@ void use_circuit_callback(void**, S32 result)
 	}
 }
 
+void pass_processObjectPropertiesFamily(LLMessageSystem *msg, void**)
+{
+	// send it to 'observers'
+	LLSelectMgr::processObjectPropertiesFamily(msg,0);
+	JCFloaterAnimList::processObjectPropertiesFamily(msg,0);
+}
+
 void register_viewer_callbacks(LLMessageSystem* msg)
 {
 	msg->setHandlerFuncFast(_PREHASH_LayerData,				process_layer_data );
@@ -3239,7 +3248,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
 	msg->setHandlerFuncFast(_PREHASH_ImprovedInstantMessage,	process_improved_im);
 	msg->setHandlerFuncFast(_PREHASH_ScriptQuestion,			process_script_question);
 	msg->setHandlerFuncFast(_PREHASH_ObjectProperties,			LLSelectMgr::processObjectProperties, NULL);
-	msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily,	LLSelectMgr::processObjectPropertiesFamily, NULL);
+	msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily,	pass_processObjectPropertiesFamily, NULL);
 	msg->setHandlerFunc("ForceObjectSelect", LLSelectMgr::processForceObjectSelect);
 
 	msg->setHandlerFuncFast(_PREHASH_MoneyBalanceReply,		process_money_balance_reply,	NULL);
-- 
cgit v1.1