automated merge

indra/newview/llvoavatarself.h

@@ -337,6 +337,15 @@ class LLVOAvatarSelf :
 	// 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 @@ class LLVOAvatarSelf :
  **                                                                            **
  *******************************************************************************/
 
-struct LLAvatarTexData
-{
-	LLAvatarTexData(const LLUUID& id, LLVOAvatarDefines::ETextureIndex index) : 
-		mAvatarID(id), 
-		mIndex(index) 
-	{}
-	LLUUID			mAvatarID;
-	LLVOAvatarDefines::ETextureIndex	mIndex;
-};
-
 };
 
 extern LLVOAvatarSelf *gAgentAvatarp;