merge with viewer-release

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index c88694ef76..861991f3c2 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -39,6 +39,7 @@
 #include "llinventoryfunctions.h"
 #include "llinventoryobserver.h"
 #include "llinventorypanel.h"
+#include "lllocaltextureobject.h"
 #include "llmd5.h"
 #include "llnotificationsutil.h"
 #include "lloutfitobserver.h"
@@ -64,10 +65,10 @@ using namespace LLAvatarAppearanceDefines;
 void wear_and_edit_cb(const LLUUID& inv_item)
 {
 	if (inv_item.isNull()) return;
-	
+
 	// Request editing the item after it gets worn.
 	gAgentWearables.requestEditingWearable(inv_item);
-	
+
 	// Wear it.
 	LLAppearanceMgr::instance().wearItemOnAvatar(inv_item);
 }
@@ -180,7 +181,7 @@ void LLAgentWearables::initClass()
 }
 
 void LLAgentWearables::setAvatarObject(LLVOAvatarSelf *avatar)
-{
+{ 
 	llassert(avatar);
 	avatar->outputRezTiming("Sending wearables request");
 	sendAgentWearablesRequest();