diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-27 22:02:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-27 22:02:05 +0000 |
| commit | 046e047b5c0031dd6a953a7fab677e085dd8d917 (patch) | |
| tree | 3b7ced47dcf7c34c07cc649a76539a1b07a9ef09 | |
| parent | 793dde16f371408948474d31f9275ea4031b65aa (diff) | |
| parent | 637fb26dd892d57a87698180adf9a8122c48b996 (diff) | |
Automated merge
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rwxr-xr-x | indra/llappearance/llavatarappearance.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index d91ea05238..0b79be64f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ <key>archive</key> <map> <key>hash</key> - <string>e737558cc184667f23f01a103cc9a41a</string> + <string>3f6d155b817f13577b96ff28160d5e12</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/265214/arch/Linux/installer/llappearanceutility_source-0.1-linux-20120926.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/265243/arch/Linux/installer/llappearanceutility_source-0.1-linux-20120927.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h index 5918d1cf2f..abe3599685 100755 --- a/indra/llappearance/llavatarappearance.h +++ b/indra/llappearance/llavatarappearance.h @@ -136,13 +136,15 @@ public: typedef std::map<std::string, LLJoint*> joint_map_t; joint_map_t mJointMap; + + void computeBodySize(); + protected: static BOOL parseSkeletonFile(const std::string& filename); virtual void buildCharacter(); virtual BOOL loadAvatar(); virtual void bodySizeChanged() = 0; - void computeBodySize(); BOOL setupBone(const LLAvatarBoneInfo* info, LLJoint* parent, S32 ¤t_volume_num, S32 ¤t_joint_num); BOOL allocateCharacterJoints(U32 num); |