diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 13:25:11 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 13:25:11 -0700 |
| commit | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (patch) | |
| tree | aa48779e0acf238f59d60dc5225e81b7c8d64e9e | |
| parent | 81e9de4a7ca69764cf5a6639594483499a4f6cf3 (diff) | |
| parent | a4c364561bfe92a0b1610a1a732de7489f54b06e (diff) | |
automated merge
| -rw-r--r-- | indra/newview/llvoavatarself.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 9dc38c953e..32a180be5d 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -337,6 +337,15 @@ public: // Avatar Rez Metrics //-------------------------------------------------------------------- public: + struct LLAvatarTexData + { + LLAvatarTexData(const LLUUID& id, LLVOAvatarDefines::ETextureIndex index) : + mAvatarID(id), + mIndex(index) + {} + LLUUID mAvatarID; + LLVOAvatarDefines::ETextureIndex mIndex; + }; void wearablesLoaded() { mTimeWearablesLoaded = mDebugSelfLoadTimer.getElapsedTimeF32(); } void avatarVisible() { mTimeAvatarVisible = mDebugSelfLoadTimer.getElapsedTimeF32(); } void outputRezDiagnostics() const; @@ -352,16 +361,6 @@ private: ** ** *******************************************************************************/ -struct LLAvatarTexData -{ - LLAvatarTexData(const LLUUID& id, LLVOAvatarDefines::ETextureIndex index) : - mAvatarID(id), - mIndex(index) - {} - LLUUID mAvatarID; - LLVOAvatarDefines::ETextureIndex mIndex; -}; - }; extern LLVOAvatarSelf *gAgentAvatarp; |