V3 mesh, texture, and hover merge.

2016-04-26 13:36:39 -05:00
parent be5d2f20bc
commit 55b5f60b68
39 changed files with 6860 additions and 4126 deletions
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -141,6 +141,8 @@ public:

 	virtual LLVOAvatar* asAvatar();

+	LLVOAvatar* getAvatarAncestor();
+
 	static void initVOClasses();
 	static void cleanupVOClasses();