diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 2c1578c05db041fda4de0ca835468bd7f53b48c4..312438e03fc8cc5810c250848b85123948409c30 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -558,7 +558,9 @@ void LLAvatarAppearance::computeBodySize() { mBodySize = new_body_size; +#if SHOW_DEBUG compareJointStateMaps(mLastBodySizeState, mCurrBodySizeState); +#endif } } diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp index f6d56a8c65cd3bed9fae87571d852bd7b42ad27a..d92727af85def2c0d38ca94e79b00877645fe3dd 100644 --- a/indra/llappearance/llavatarjointmesh.cpp +++ b/indra/llappearance/llavatarjointmesh.cpp @@ -53,7 +53,9 @@ LLAvatarJoint *getBaseSkeletonAncestor(LLAvatarJoint* joint) LLJoint *ancestor = joint->getParent(); while (ancestor->getParent() && (ancestor->getSupport() != LLJoint::SUPPORT_BASE)) { +#if SHOW_DEBUG LL_DEBUGS("Avatar") << "skipping non-base ancestor " << ancestor->getName() << LL_ENDL; +#endif ancestor = ancestor->getParent(); } return (LLAvatarJoint*) ancestor; diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 7fcfeab7a5827db4285bf5305467807d1bcb87ed..dc6dfef7b9c23bc9dadfa64165f45e8c89250553 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2370,7 +2370,9 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size) U32 uzip_result = LLUZipHelper::unzip_llsd(mdl, is, size); if (uzip_result != LLUZipHelper::ZR_OK) { +#if SHOW_DEBUG LL_DEBUGS("MeshStreaming") << "Failed to unzip LLSD blob for LoD with code " << uzip_result << " , will probably fetch from sim again." << LL_ENDL; +#endif return false; } diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 0dc7eeead729ae2d50371a22475b30dadbc3c32c..e68cbcc78a170144d76b2783667e761aabe9f527 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -1033,8 +1033,9 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) mHeartbeat.setTimerExpirySec(mPluginLockupTimeout); mCPUUsage = message.getValueReal("cpu_usage"); - +#if SHOW_DEBUG LL_DEBUGS("Plugin") << "cpu usage reported as " << mCPUUsage << LL_ENDL; +#endif } else if(message_name == "shm_add_response") diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp index dc45aa2e3f6812b3d4e02999ad4cf88deb11d6a0..be7ae70e9736d158c6b54e4eadfb18d79ac08a5a 100644 --- a/indra/newview/llpanelland.cpp +++ b/indra/newview/llpanelland.cpp @@ -200,7 +200,9 @@ void LLPanelLandInfo::refresh() } else { +#if SHOW_DEBUG LL_DEBUGS() << "Invalid selection for joining land" << LL_ENDL; +#endif mButtonJoinLand->setEnabled(FALSE); } diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index 1fde077fa42157c5576b9909adef8f1292845022..d0beead91348232af6f9902e056d2c308fcc168e 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -532,13 +532,17 @@ void LLViewerAssetStorage::assetRequestCoro( LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults); if (!status) { +#if SHOW_DEBUG LL_DEBUGS("ViewerAsset") << "request failed, status " << status.toTerseString() << LL_ENDL; +#endif result_code = LL_ERR_ASSET_REQUEST_FAILED; ext_status = LLExtStat::NONE; } else { +#if SHOW_DEBUG LL_DEBUGS("ViewerAsset") << "request succeeded, url " << url << LL_ENDL; +#endif const LLSD::Binary &raw = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS_RAW].asBinary(); diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 7fcd56eef24cd901ce0098b03d131e0639caa3bc..9ae17900f0ca609c24e02da884d123a7280680bd 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2686,7 +2686,9 @@ void LLViewerRegion::requestCacheMisses() msg->addU8Fast(_PREHASH_CacheMissType, (*iter).mType); msg->addU32Fast(_PREHASH_ID, (*iter).mID); +#if SHOW_DEBUG LL_DEBUGS("AnimatedObjects") << "Requesting cache missed object " << (*iter).mID << LL_ENDL; +#endif blocks++; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9a0405dcabcfad9a8706b8b8495d9d9fed102a0b..8caedc7706c94b4bd051f2bb641f9cd9f1572cba 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2367,7 +2367,9 @@ LLViewerFetchedTexture *LLVOAvatar::getBakedTextureImage(const U8 te, const LLUU LL_WARNS() << "unable to determine URL for te " << te << " uuid " << uuid << LL_ENDL; return NULL; } +#if SHOW_DEBUG LL_DEBUGS("Avatar") << avString() << "get server-bake image from URL " << url << LL_ENDL; +#endif result = LLViewerTextureManager::getFetchedTextureFromUrl( url, FTT_SERVER_BAKE, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, uuid); if (result->isMissingAsset()) @@ -9222,7 +9224,9 @@ void LLVOAvatar::applyParsedAppearanceMessage(LLAppearanceMessageContents& conte // Got an update for some other avatar // Ignore updates for self, because we have a more authoritative value in the preferences. setHoverOffset(contents.mHoverOffset); +#if SHOW_DEBUG LL_DEBUGS("Avatar") << avString() << "setting hover to " << contents.mHoverOffset[2] << LL_ENDL; +#endif } if (!contents.mHoverOffsetWasSet && !isSelf())