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

sunshine cleanup annotations

master
Brad Payne (Vir Linden) 2013-09-18 17:03:34 -04:00
parent c2ddc68afe
commit 36bb33b12a
17 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llappearance/llavatarappearance.h Normal file → Executable file
View File

@ -225,6 +225,7 @@ public:
// Composites
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP no upload
virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result) = 0;
/********************************************************************************
@ -256,6 +257,7 @@ protected:
// Clothing colors (convenience functions to access visual parameters)
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP no upload
void setClothesColor(LLAvatarAppearanceDefines::ETextureIndex te, const LLColor4& new_color, BOOL upload_bake);
LLColor4 getClothesColor(LLAvatarAppearanceDefines::ETextureIndex te);
static BOOL teToColorParams(LLAvatarAppearanceDefines::ETextureIndex te, U32 *param_name);
@ -265,6 +267,7 @@ public:
//--------------------------------------------------------------------
public:
LLColor4 getGlobalColor(const std::string& color_name ) const;
// SUNSHINE CLEANUP no upload
virtual void onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake) = 0;
protected:
LLTexGlobalColor* mTexSkinColor;

1
indra/llappearance/lltexglobalcolor.cpp
View File

@ -103,6 +103,7 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color)
return new_param;
}
// SUNSHINE CLEANUP no upload
void LLTexParamGlobalColor::onGlobalColorChanged(bool upload_bake)
{
mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor, upload_bake);

1
indra/llappearance/lltexglobalcolor.h
View File

@ -75,6 +75,7 @@ public:
LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
protected:
// SUNSHINE CLEANUP no upload
/*virtual*/ void onGlobalColorChanged(bool upload_bake);
private:
LLTexGlobalColor* mTexGlobalColor;

5
indra/llappearance/lltexlayerparams.cpp Normal file → Executable file
View File

@ -160,6 +160,7 @@ BOOL LLTexLayerParamAlpha::getMultiplyBlend() const
return ((LLTexLayerParamAlphaInfo *)getInfo())->mMultiplyBlend;
}
// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake)
{
if (mIsAnimating || mTexLayer == NULL)
@ -184,6 +185,7 @@ void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake)
}
}
// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value, BOOL upload_bake)
{
// do not animate dummy parameters
@ -202,6 +204,7 @@ void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value, BOOL upload_bake
}
}
// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamAlpha::animate(F32 delta, BOOL upload_bake)
{
if (mNext)
@ -449,6 +452,8 @@ LLColor4 LLTexLayerParamColor::getNetColor() const
}
}
// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamColor::setWeight(F32 weight, BOOL upload_bake)
{
if (mIsAnimating)

4
indra/llappearance/lltexlayerparams.h Normal file → Executable file
View File

@ -83,8 +83,11 @@ public:
// LLVisualParam Virtual functions
///*virtual*/ BOOL parseData(LLXmlTreeNode* node);
/*virtual*/ void apply( ESex avatar_sex ) {}
// SUNSHINE CLEANUP no upload_bake
/*virtual*/ void setWeight(F32 weight, BOOL upload_bake);
// SUNSHINE CLEANUP no upload_bake
/*virtual*/ void setAnimationTarget(F32 target_value, BOOL upload_bake);
// SUNSHINE CLEANUP no upload_bake
/*virtual*/ void animate(F32 delta, BOOL upload_bake);
// LLViewerVisualParam Virtual functions
@ -190,6 +193,7 @@ public:
// New functions
LLColor4 getNetColor() const;
protected:
// SUNSHINE CLEANUP no upload
virtual void onGlobalColorChanged(bool upload_bake) {}
private:
LL_ALIGN_16(LLVector4a mAvgDistortionVec);

2
indra/newview/llagent.cpp
View File

@ -3612,6 +3612,7 @@ void LLAgent::processControlRelease(LLMessageSystem *msg, void **)
}
*/
// SUNSHINE CLEANUP dead code?
//static
void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void **user_data)
{
@ -4300,6 +4301,7 @@ void LLAgent::dumpSentAppearance(const std::string& dump_prefix)
//-----------------------------------------------------------------------------
// sendAgentSetAppearance()
//-----------------------------------------------------------------------------
// SUNSHINE CLEANUP dead
void LLAgent::sendAgentSetAppearance()
{
if (gAgentQueryManager.mNumPendingQueries > 0)

2
indra/newview/llagent.h
View File

@ -844,6 +844,7 @@ private:
public:
void sendMessage(); // Send message to this agent's region
void sendReliableMessage();
// SUNSHINE CLEANUP dead code
void dumpSentAppearance(const std::string& dump_prefix);
void sendAgentSetAppearance();
void sendAgentDataUpdateRequest();
@ -859,6 +860,7 @@ public:
static void processAgentGroupDataUpdate(LLMessageSystem *msg, void **);
static void processAgentDropGroup(LLMessageSystem *msg, void **);
static void processScriptControlChange(LLMessageSystem *msg, void **);
// SUNSHINE CLEANUP dead code?
static void processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void **user_data);
/** Messaging

1
indra/newview/llagentwearables.cpp
View File

@ -1488,6 +1488,7 @@ void LLAgentWearables::setWearableFinal(LLInventoryItem* new_item, LLViewerWeara
updateServer();
}
// SUNSHINE CLEANUP dead?
void LLAgentWearables::queryWearableCache()
{
if (!areWearablesLoaded() || (gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion()))

1
indra/newview/llagentwearables.h
View File

@ -158,6 +158,7 @@ protected:
//--------------------------------------------------------------------
public:
// Processes the initial wearables update message (if necessary, since the outfit folder makes it redundant)
// SUNSHINE CLEANUP - should be able to remove dependency on this.
static void processAgentInitialWearablesUpdate(LLMessageSystem* mesgsys, void** user_data);
protected:

1
indra/newview/llassetuploadresponders.h
View File

@ -116,6 +116,7 @@ private:
Impl* mImpl;
};
// SUNSHINE CLEANUP no upload bakes, remove class.
struct LLBakedUploadData;
class LLSendTexLayerResponder : public LLAssetUploadResponder
{

1
indra/newview/llviewertexlayer.cpp Normal file → Executable file
View File

@ -272,6 +272,7 @@ BOOL LLViewerTexLayerSetBuffer::uploadPending() const
return mUploadPending;
}
// SUNSHINE CLEANUP no upload
BOOL LLViewerTexLayerSetBuffer::uploadNeeded() const
{
return mNeedsUpload;

17
indra/newview/llviewertexlayer.h Normal file → Executable file
View File

@ -119,25 +119,41 @@ protected:
// Uploads
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP no upload
void requestUpload();
// SUNSHINE CLEANUP no upload
void cancelUpload();
// SUNSHINE CLEANUP no upload
BOOL uploadNeeded() const; // We need to upload a new texture
// SUNSHINE CLEANUP no upload
BOOL uploadInProgress() const; // We have started uploading a new texture and are awaiting the result
// SUNSHINE CLEANUP no upload
BOOL uploadPending() const; // We are expecting a new texture to be uploaded at some point
// SUNSHINE CLEANUP no upload
static void onTextureUploadComplete(const LLUUID& uuid,
void* userdata,
S32 result, LLExtStat ext_status);
protected:
// SUNSHINE CLEANUP no upload
BOOL isReadyToUpload() const;
// SUNSHINE CLEANUP no upload
void doUpload(); // Does a read back and upload.
// SUNSHINE CLEANUP no upload
void conditionalRestartUploadTimer();
private:
// SUNSHINE CLEANUP no upload
BOOL mNeedsUpload; // Whether we need to send our baked textures to the server
// SUNSHINE CLEANUP no upload
U32 mNumLowresUploads; // Number of times we've sent a lowres version of our baked textures to the server
// SUNSHINE CLEANUP no upload
BOOL mUploadPending; // Whether we have received back the new baked textures
// SUNSHINE CLEANUP no upload
LLUUID mUploadID; // The current upload process (null if none).
// SUNSHINE CLEANUP no upload
LLFrameTimer mNeedsUploadTimer; // Tracks time since upload was requested and performed.
// SUNSHINE CLEANUP no upload
S32 mUploadFailCount; // Number of consecutive upload failures
// SUNSHINE CLEANUP no upload
LLFrameTimer mUploadRetryTimer; // Tracks time since last upload failure.
//--------------------------------------------------------------------
@ -162,6 +178,7 @@ private:
//
// Used by LLTexLayerSetBuffer for a callback.
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// SUNSHINE CLEANUP no upload
struct LLBakedUploadData
{
LLBakedUploadData(const LLVOAvatarSelf* avatar,

2
indra/newview/llviewertexture.cpp
View File

@ -964,6 +964,8 @@ LLViewerFetchedTexture::LLViewerFetchedTexture(const LLUUID& id, FTType f_type,
mFTType = f_type;
if (mFTType == FTT_HOST_BAKE)
{
// SUNSHINE CLEANUP
llassert(false);
mCanUseHTTP = false;
}
generateGLTexture() ;

6
indra/newview/llvoavatar.cpp
View File

@ -1897,6 +1897,8 @@ LLViewerFetchedTexture *LLVOAvatar::getBakedTextureImage(const U8 te, const LLUU
}
else
{
// SUNSHINE CLEANUP
llassert(false);
LL_DEBUGS("Avatar") << avString() << "get old-bake image from host " << uuid << llendl;
LLHost host = getObjectHost();
result = LLViewerTextureManager::getFetchedTexture(
@ -5345,6 +5347,7 @@ BOOL LLVOAvatar::updateGeometry(LLDrawable *drawable)
//-----------------------------------------------------------------------------
// updateSexDependentLayerSets()
//-----------------------------------------------------------------------------
// SUNSHINE CLEANUP no upload_bake
void LLVOAvatar::updateSexDependentLayerSets( BOOL upload_bake )
{
invalidateComposite( mBakedTextureDatas[BAKED_HEAD].mTexLayerSet, upload_bake );
@ -5829,6 +5832,7 @@ BOOL LLVOAvatar::isWearingWearableType(LLWearableType::EType type) const
// virtual
// SUNSHINE CLEANUP no upload_result
void LLVOAvatar::invalidateComposite( LLTexLayerSet* layerset, BOOL upload_result )
{
}
@ -5838,6 +5842,7 @@ void LLVOAvatar::invalidateAll()
}
// virtual
// SUNSHINE CLEANUP no upload_bake
void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake )
{
if (global_color == mTexSkinColor)
@ -7611,6 +7616,7 @@ void LLVOAvatar::startAppearanceAnimation()
}
//virtual
// SUNSHINE CLEANUP dead code
void LLVOAvatar::bodySizeChanged()
{
if (isSelf() && !LLAppearanceMgr::instance().isInUpdateAppearanceFromCOF())

2
indra/newview/llvoavatar.h
View File

@ -402,6 +402,7 @@ public:
// Global colors
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP no upload
/*virtual*/void onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake);
//--------------------------------------------------------------------
@ -562,6 +563,7 @@ protected:
// Composites
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP no upload
virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result);
virtual void invalidateAll();
virtual void setCompositeUpdatesEnabled(bool b) {}

10
indra/newview/llvoavatarself.cpp
View File

@ -673,6 +673,7 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name)
return LLVOAvatar::getJoint(name);
}
// virtual
// SUNSHINE CLEANUP no upload_bake
BOOL LLVOAvatarSelf::setVisualParamWeight(const LLVisualParam *which_param, F32 weight, BOOL upload_bake )
{
if (!which_param)
@ -684,6 +685,7 @@ BOOL LLVOAvatarSelf::setVisualParamWeight(const LLVisualParam *which_param, F32
}
// virtual
// SUNSHINE CLEANUP no upload_bake
BOOL LLVOAvatarSelf::setVisualParamWeight(const char* param_name, F32 weight, BOOL upload_bake )
{
if (!param_name)
@ -695,12 +697,14 @@ BOOL LLVOAvatarSelf::setVisualParamWeight(const char* param_name, F32 weight, BO
}
// virtual
// SUNSHINE CLEANUP no upload_bake
BOOL LLVOAvatarSelf::setVisualParamWeight(S32 index, F32 weight, BOOL upload_bake )
{
LLViewerVisualParam *param = (LLViewerVisualParam*) LLCharacter::getVisualParam(index);
return setParamWeight(param,weight,upload_bake);
}
// SUNSHINE CLEANUP no upload_bake
BOOL LLVOAvatarSelf::setParamWeight(const LLViewerVisualParam *param, F32 weight, BOOL upload_bake )
{
if (!param)
@ -794,6 +798,8 @@ U32 LLVOAvatarSelf::processUpdateMessage(LLMessageSystem *mesgsys,
{
U32 retval = LLVOAvatar::processUpdateMessage(mesgsys,user_data,block_num,update_type,dp);
// SUNSHINE CLEANUP - does this become relevant again if we don't have to wait for appearance message to tell us where bakes are coming from?
#if 0
// DRANO - it's not clear this does anything useful. If we wait
// until an appearance message has been received, we already have
@ -1065,6 +1071,7 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode)
// forces an update to any baked textures relevant to type.
// will force an upload of the resulting bake if the second parameter is TRUE
//-----------------------------------------------------------------------------
// SUNSHINE CLEANUP no upload_result
void LLVOAvatarSelf::wearableUpdated( LLWearableType::EType type, BOOL upload_result )
{
for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
@ -1620,6 +1627,7 @@ bool LLVOAvatarSelf::hasPendingBakedUploads() const
return false;
}
// SUNSHINE CLEANUP no upload_bake
void LLVOAvatarSelf::invalidateComposite( LLTexLayerSet* layerset, BOOL upload_result )
{
LLViewerTexLayerSet *layer_set = dynamic_cast<LLViewerTexLayerSet*>(layerset);
@ -2690,6 +2698,8 @@ void LLVOAvatarSelf::setNewBakedTexture(LLAvatarAppearanceDefines::EBakedTexture
//-----------------------------------------------------------------------------
void LLVOAvatarSelf::setNewBakedTexture( ETextureIndex te, const LLUUID& uuid )
{
// SUNSHINE CLEANUP
llassert(false);
// Baked textures live on other sims.
LLHost target_host = getObjectHost();
setTEImage( te, LLViewerTextureManager::getFetchedTextureFromHost( uuid, FTT_HOST_BAKE, target_host ) );

2
indra/newview/llvoavatarself.h
View File

@ -248,6 +248,7 @@ protected:
// Layers
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP
void requestLayerSetUploads();
void requestLayerSetUpload(LLAvatarAppearanceDefines::EBakedTextureIndex i);
void requestLayerSetUpdate(LLAvatarAppearanceDefines::ETextureIndex i);
@ -259,6 +260,7 @@ public:
// Composites
//--------------------------------------------------------------------
public:
// SUNSHINE CLEANUP no upload
/* virtual */ void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result);
/* virtual */ void invalidateAll();
/* virtual */ void setCompositeUpdatesEnabled(bool b); // only works for self