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

More clean-up to closer match original file order. For llavatarappearance diffs

meow-7.2.2
Don Kjer 2012-09-04 04:24:47 +00:00
parent 403d1b6404
commit 7b4385420e
8 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
indra/llappearance/llavatarappearance.h
View File

@ -31,8 +31,8 @@
#include "llframetimer.h"
#include "llavatarappearancedefines.h"
class LLTexGlobalColor;
class LLTexLayerSet;
class LLTexGlobalColor;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// LLAvatarAppearance
@ -43,9 +43,73 @@ class LLAvatarAppearance : public LLCharacter
{
LOG_CLASS(LLAvatarAppearance);
/********************************************************************************
** **
** INITIALIZATION
**/
public:
LLAvatarAppearance();
/** Initialization
** **
*******************************************************************************/
/********************************************************************************
** **
** STATE
**/
public:
virtual bool isSelf() const { return false; } // True if this avatar is for this viewer's agent
virtual BOOL isUsingBakedTextures() const = 0;
/** State
** **
*******************************************************************************/
/********************************************************************************
** **
** RENDERING
**/
BOOL mIsDummy; // for special views
//--------------------------------------------------------------------
// Morph masks
//--------------------------------------------------------------------
public:
virtual void applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components, LLAvatarAppearanceDefines::EBakedTextureIndex index = LLAvatarAppearanceDefines::BAKED_NUM_INDICES) = 0;
/** Rendering
** **
*******************************************************************************/
//--------------------------------------------------------------------
// Composites
//--------------------------------------------------------------------
public:
virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result) = 0;
/********************************************************************************
** **
** MESHES
**/
public:
virtual void updateMeshTextures() = 0;
virtual void dirtyMesh() = 0; // Dirty the avatar mesh
protected:
virtual void dirtyMesh(S32 priority) = 0; // Dirty the avatar mesh, with priority
/** Meshes
** **
*******************************************************************************/
/********************************************************************************
** **
** APPEARANCE
**/
//--------------------------------------------------------------------
// Clothing colors (convenience functions to access visual parameters)
//--------------------------------------------------------------------
@ -66,54 +130,29 @@ protected:
LLTexGlobalColor* mTexEyeColor;
//--------------------------------------------------------------------
// Morph masks
// Visibility
//--------------------------------------------------------------------
public:
virtual void applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components, LLAvatarAppearanceDefines::EBakedTextureIndex index = LLAvatarAppearanceDefines::BAKED_NUM_INDICES) = 0;
//--------------------------------------------------------------------
// Composites
//--------------------------------------------------------------------
public:
virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result) = 0;
/********************************************************************************
static LLColor4 getDummyColor();
/** Appearance
** **
** MESHES
**/
virtual void dirtyMesh() = 0; // Dirty the avatar mesh
virtual void dirtyMesh(S32 priority) = 0; // Dirty the avatar mesh, with priority
/********************************************************************************
** **
** RENDERING
**/
BOOL mIsDummy; // for special views
/********************************************************************************
** **
** STATE
**/
public:
virtual bool isSelf() const { return false; } // True if this avatar is for this viewer's agent
virtual BOOL isUsingBakedTextures() const = 0;
*******************************************************************************/
/********************************************************************************
** **
** WEARABLES
**/
public:
virtual BOOL isWearingWearableType(LLWearableType::EType type ) const = 0;
virtual U32 getWearableCount(const LLWearableType::EType type) const = 0;
virtual U32 getWearableCount(const U32 tex_index) const = 0;
virtual LLWearable* getWearable(const LLWearableType::EType type, U32 index /*= 0*/) = 0;
virtual const LLWearable* getWearable(const LLWearableType::EType type, U32 index /*= 0*/) const = 0;
virtual BOOL isWearingWearableType(LLWearableType::EType type ) const = 0;
public:
static LLColor4 getDummyColor();
virtual void updateMeshTextures() = 0;
};
#endif // LL_AVATAR_APPEARANCE_H

1
indra/llappearance/llinventoryicon.cpp
View File

@ -24,7 +24,6 @@
* $/LicenseInfo$
*/
//#include "llviewerprecompiledheaders.h"
#include "linden_common.h"
#include "llinventoryicon.h"

2
indra/llappearance/lltexglobalcolor.cpp
View File

@ -25,10 +25,8 @@
*/
#include "linden_common.h"
#include "llavatarappearance.h"
#include "lltexlayer.h"
//#include "llwearable.h"
#include "lltexglobalcolor.h"
class LLWearable;

1
indra/llappearance/llviewervisualparam.cpp
View File

@ -27,7 +27,6 @@
//-----------------------------------------------------------------------------
// Header Files
//-----------------------------------------------------------------------------
//#include "llviewerprecompiledheaders.h"
#include "linden_common.h"
#include "llviewervisualparam.h"

1
indra/llappearance/llwearabletype.cpp
View File

@ -25,7 +25,6 @@
*/
#include "linden_common.h"
#include "llwearabletype.h"
#include "llinventoryicon.h"
#include "lltrans.h"

3
indra/newview/lltexturefetch.cpp
View File

@ -973,7 +973,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
else if(!mUrl.empty() && mCanUseHTTP)
{
if (!(mUrl.compare(0, 7, "http://") == 0))
if (!(mUrl.compare(0, 7, "http://") == 0) &&
!(mUrl.compare(0, 8, "https://") == 0))
{
// *TODO:?remove this warning
llwarns << "Unknown URL Type: " << mUrl << llendl;

1
indra/newview/llvoavatar.h
View File

@ -454,7 +454,6 @@ public:
static void deleteCachedImages(bool clearAll=true);
static void destroyGL();
static void restoreGL();
BOOL mIsDummy; // for special views
S32 mSpecialRenderMode; // special lighting
U32 mAttachmentGeometryBytes; //number of bytes in attached geometry
F32 mAttachmentSurfaceArea; //estimated surface area of attachments

4
indra/newview/llwearablelist.cpp
View File

@ -112,8 +112,8 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
else
{
wearable = new LLViewerWearable(uuid);
bool res = wearable->importFile( fp );
if (!res)
LLWearable::EImportResult result = wearable->importFile( fp );
if (LLWearable::SUCCESS != result)
{
if (wearable->getType() == LLWearableType::WT_COUNT)
{