livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the Mac and Linux build after llwearable breakage. Needed to add 

an explicit include for LLViewerFetchedTexture because it's used for
a template specialization, and fixed LLLocalTextureObject constructor
to take a const LLUUID reference so locals can be passed.
meow-7.2.2
Lynx Linden 2009-10-22 12:22:06 +01:00
parent 1478be6b73
commit 4c4da8aca2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lllocaltextureobject.cpp
View File

@ -47,7 +47,7 @@ LLLocalTextureObject::LLLocalTextureObject() :
mImage = NULL;
}
LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture* image, LLUUID& id)
LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture* image, const LLUUID& id)
{
mImage = image;
gGL.getTexUnit(0)->bind(mImage);

5
indra/newview/lllocaltextureobject.h
View File

@ -35,7 +35,8 @@
#include <boost/shared_ptr.hpp>
class LLViewerFetchedTexture;
#include "llviewertexture.h"
class LLUUID;
class LLTexLayer;
class LLTextureEntry;
@ -49,7 +50,7 @@ class LLLocalTextureObject
{
public:
LLLocalTextureObject();
LLLocalTextureObject(LLViewerFetchedTexture* image, LLUUID& id);
LLLocalTextureObject(LLViewerFetchedTexture* image, const LLUUID& id);
LLLocalTextureObject(const LLLocalTextureObject& lto);
~LLLocalTextureObject();

1
indra/newview/llwearable.cpp
View File

@ -35,6 +35,7 @@
#include "llagent.h"
#include "llagentwearables.h"
#include "llfloatercustomize.h"
#include "lllocaltextureobject.h"
#include "llviewertexturelist.h"
#include "llinventorymodel.h"
#include "llviewerregion.h"