Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test: localassetbrowser preview related floaters hgfloatertexteditor maps media textures! Currently very hacky web browser alpha masks on avatars bumpmaps Are all sky components appearing? LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc) Snapshot related features Customize avatar vfs floater UI textures in general Texture priority issues
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
//
|
||||
//
|
||||
|
||||
class LLViewerImage;
|
||||
class LLViewerTexture;
|
||||
class LLViewerObject;
|
||||
class LLViewerPart;
|
||||
|
||||
@@ -89,7 +89,7 @@ protected:
|
||||
F32 mLastUpdateTime;
|
||||
F32 mLastPartTime;
|
||||
LLUUID mOwnerUUID;
|
||||
LLPointer<LLViewerImage> mImagep;
|
||||
LLPointer<LLViewerTexture> mImagep;
|
||||
|
||||
// Particle information
|
||||
U32 mPartFlags; // Flags for the particle
|
||||
@@ -122,8 +122,8 @@ public:
|
||||
static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp);
|
||||
static LLPointer<LLViewerPartSourceScript> createPSS(LLViewerObject *source_objp, const LLPartSysData& particle_parameters);
|
||||
|
||||
LLViewerImage *getImage() const { return mImagep; }
|
||||
void setImage(LLViewerImage *imagep);
|
||||
LLViewerTexture *getImage() const { return mImagep; }
|
||||
void setImage(LLViewerTexture *imagep);
|
||||
LLPartSysData mPartSysData;
|
||||
|
||||
void setTargetObject(LLViewerObject *objp);
|
||||
|
||||
Reference in New Issue
Block a user