Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata

2013-01-04 20:50:35 -06:00
parent 5ada2d4b6f
commit 9596514c79
57 changed files with 3350 additions and 2819 deletions
--- a/indra/newview/importtracker.cpp
+++ b/indra/newview/importtracker.cpp
@@ -642,7 +642,7 @@ void ImportTracker::send_inventory(LLSD& prim)
 							LLFILE* fp = LLFile::fopen(data->filename, "rb");
 							if(fp)//HACK LOL LOL LOL
 							{
-								LLWearable* wearable = new LLWearable(LLUUID::null);
+								LLViewerWearable* wearable = new LLWearable(LLUUID::null);
 								wearable->importFile( fp );
 								//if (!res)
 								{