Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
# Conflicts: # indra/llcommon/llstring.h # indra/newview/llviewermenu.cpp # indra/newview/llviewerregion.cpp
This commit is contained in:
@@ -3069,6 +3069,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
|
||||
msg->setHandlerFuncFast(_PREHASH_NameValuePair, process_name_value);
|
||||
msg->setHandlerFuncFast(_PREHASH_RemoveNameValuePair, process_remove_name_value);
|
||||
msg->setHandlerFuncFast(_PREHASH_AvatarAnimation, process_avatar_animation);
|
||||
msg->setHandlerFuncFast(_PREHASH_ObjectAnimation, process_object_animation);
|
||||
msg->setHandlerFuncFast(_PREHASH_AvatarAppearance, process_avatar_appearance);
|
||||
msg->setHandlerFunc("AgentCachedTextureResponse", LLAgent::processAgentCachedTextureResponse);
|
||||
msg->setHandlerFunc("RebakeAvatarTextures", LLVOAvatarSelf::processRebakeAvatarTextures);
|
||||
|
||||
Reference in New Issue
Block a user