diff options
author | McCabe Maxsted | 2010-04-25 18:29:36 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-04-25 18:29:36 -0700 |
commit | 7a82030c642ffb0d3cd3f8e42b65addab9b776fc (patch) | |
tree | 78a0757d9eb5849f0124ec4b8b16ba6ba4f74fc4 /linden | |
parent | Tidied up settings.xml, removed a duplicate entry (diff) | |
download | meta-impy-7a82030c642ffb0d3cd3f8e42b65addab9b776fc.zip meta-impy-7a82030c642ffb0d3cd3f8e42b65addab9b776fc.tar.gz meta-impy-7a82030c642ffb0d3cd3f8e42b65addab9b776fc.tar.bz2 meta-impy-7a82030c642ffb0d3cd3f8e42b65addab9b776fc.tar.xz |
Fixed animation list
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
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 @@ | |||
186 | #include "llwaterparammanager.h" | 186 | #include "llwaterparammanager.h" |
187 | #include "llagentlanguage.h" | 187 | #include "llagentlanguage.h" |
188 | 188 | ||
189 | #include "jcfloater_animation_list.h" | ||
190 | |||
189 | #if LL_LIBXUL_ENABLED | 191 | #if LL_LIBXUL_ENABLED |
190 | #include "llmozlib.h" | 192 | #include "llmozlib.h" |
191 | #endif // LL_LIBXUL_ENABLED | 193 | #endif // LL_LIBXUL_ENABLED |
@@ -3196,6 +3198,13 @@ void use_circuit_callback(void**, S32 result) | |||
3196 | } | 3198 | } |
3197 | } | 3199 | } |
3198 | 3200 | ||
3201 | void pass_processObjectPropertiesFamily(LLMessageSystem *msg, void**) | ||
3202 | { | ||
3203 | // send it to 'observers' | ||
3204 | LLSelectMgr::processObjectPropertiesFamily(msg,0); | ||
3205 | JCFloaterAnimList::processObjectPropertiesFamily(msg,0); | ||
3206 | } | ||
3207 | |||
3199 | void register_viewer_callbacks(LLMessageSystem* msg) | 3208 | void register_viewer_callbacks(LLMessageSystem* msg) |
3200 | { | 3209 | { |
3201 | msg->setHandlerFuncFast(_PREHASH_LayerData, process_layer_data ); | 3210 | msg->setHandlerFuncFast(_PREHASH_LayerData, process_layer_data ); |
@@ -3239,7 +3248,7 @@ void register_viewer_callbacks(LLMessageSystem* msg) | |||
3239 | msg->setHandlerFuncFast(_PREHASH_ImprovedInstantMessage, process_improved_im); | 3248 | msg->setHandlerFuncFast(_PREHASH_ImprovedInstantMessage, process_improved_im); |
3240 | msg->setHandlerFuncFast(_PREHASH_ScriptQuestion, process_script_question); | 3249 | msg->setHandlerFuncFast(_PREHASH_ScriptQuestion, process_script_question); |
3241 | msg->setHandlerFuncFast(_PREHASH_ObjectProperties, LLSelectMgr::processObjectProperties, NULL); | 3250 | msg->setHandlerFuncFast(_PREHASH_ObjectProperties, LLSelectMgr::processObjectProperties, NULL); |
3242 | msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily, LLSelectMgr::processObjectPropertiesFamily, NULL); | 3251 | msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily, pass_processObjectPropertiesFamily, NULL); |
3243 | msg->setHandlerFunc("ForceObjectSelect", LLSelectMgr::processForceObjectSelect); | 3252 | msg->setHandlerFunc("ForceObjectSelect", LLSelectMgr::processForceObjectSelect); |
3244 | 3253 | ||
3245 | msg->setHandlerFuncFast(_PREHASH_MoneyBalanceReply, process_money_balance_reply, NULL); | 3254 | msg->setHandlerFuncFast(_PREHASH_MoneyBalanceReply, process_money_balance_reply, NULL); |