diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llagent.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llagent.h | 2 | ||||
| -rwxr-xr-x | indra/newview/llagentwearables.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/llagentwearables.h | 1 | ||||
| -rwxr-xr-x | indra/newview/llassetuploadresponders.h | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewertexlayer.cpp | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewertexlayer.h | 17 | ||||
| -rwxr-xr-x | indra/newview/llviewertexture.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.h | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 10 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 2 |
12 files changed, 47 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 5f87d73c40..c13082efdc 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -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) diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index f5f26f69d8..3681b81afa 100755 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -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 diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 8501436b5b..0bb126ffd1 100755 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -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())) diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 96fe4b80c0..fd9f6f74a1 100755 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -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: diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index abfdc4ca77..7c48f2f06b 100755 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -116,6 +116,7 @@ private: Impl* mImpl; }; +// SUNSHINE CLEANUP no upload bakes, remove class. struct LLBakedUploadData; class LLSendTexLayerResponder : public LLAssetUploadResponder { diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp index 777e1f9c76..c17e85f7a6 100644..100755 --- a/indra/newview/llviewertexlayer.cpp +++ b/indra/newview/llviewertexlayer.cpp @@ -272,6 +272,7 @@ BOOL LLViewerTexLayerSetBuffer::uploadPending() const return mUploadPending; } +// SUNSHINE CLEANUP no upload BOOL LLViewerTexLayerSetBuffer::uploadNeeded() const { return mNeedsUpload; diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h index 959c883da8..aa4bad3422 100644..100755 --- a/indra/newview/llviewertexlayer.h +++ b/indra/newview/llviewertexlayer.h @@ -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, diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 7e35af7e63..80f25b7d4c 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -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() ; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 93247a3625..8e293d0c06 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -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()) diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 8d047045cb..13c0332d35 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -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) {} diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ac59aa0907..f6b29f2eb4 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -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 ) ); diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 3cbf2b5cf5..7eeaaf5fe5 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -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 |