diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp
index c79568d1e0ba736dfa54efeca44b3f30e198c722..5bd4d4101a852777c60a7c0c6360103acf62aef0 100644
--- a/indra/llaudio/llaudioengine_fmodstudio.cpp
+++ b/indra/llaudio/llaudioengine_fmodstudio.cpp
@@ -484,7 +484,9 @@ bool LLAudioChannelFMODSTUDIO::updateBuffer()
}
else
{
+#if SHOW_DEBUG
LL_DEBUGS() << "No source buffer!" << LL_ENDL;
+#endif
return false;
}
diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp
index 467db116b147bdde0a7541889a65e4f035acae96..371794e63fdf58ddb2094d1ec2d976e2022a6d4b 100644
--- a/indra/llcorehttp/_httppolicy.cpp
+++ b/indra/llcorehttp/_httppolicy.cpp
@@ -175,12 +175,14 @@ void HttpPolicy::retryOp(const HttpOpRequest::ptr_t &op)
{
++op->mPolicy503Retries;
}
+#if SHOW_DEBUG
LL_DEBUGS(LOG_CORE) << "HTTP request " << op->getHandle()
<< " retry " << op->mPolicyRetries
<< " scheduled in " << (delta / HttpTime(1000))
<< " mS (" << (external_delta ? "external" : "internal")
<< "). Status: " << op->mStatus.toTerseString()
<< LL_ENDL;
+#endif
if (op->mTracing > HTTP_TRACE_OFF)
{
LL_INFOS(LOG_CORE) << "TRACE, ToRetryQueue, Handle: "
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 3cc7f5a52d032306b8c71bcd5a56f60089f807eb..6e5e9d3b5b3a66370542e49066e647cf2b215e87 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -174,7 +174,9 @@ bool LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
// dereference the array.
if(!image || !image->numcomps)
{
+#if SHOW_DEBUG
LL_DEBUGS("Texture") << "ERROR -> decodeImpl: failed to decode image!" << LL_ENDL;
+#endif
if (image)
{
opj_image_destroy(image);
@@ -251,7 +253,9 @@ bool LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
}
else // Some rare OpenJPEG versions have this bug.
{
+#if SHOW_DEBUG
LL_DEBUGS("Texture") << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << LL_ENDL;
+#endif
opj_image_destroy(image);
base.decodeFailed();
return true; // done
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index edf3c812eec19a10fa55bd05ae4b28f0bef40079..c565ccacb2a04a948248cea9a07cd3ca0636c37f 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -275,6 +275,7 @@ bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind)
}
else
{
+#if SHOW_DEBUG
if (texture)
{
LL_DEBUGS() << "NULL LLTexUnit::bind GL image" << LL_ENDL;
@@ -283,6 +284,7 @@ bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind)
{
LL_DEBUGS() << "NULL LLTexUnit::bind texture" << LL_ENDL;
}
+#endif
return false;
}
}
@@ -301,7 +303,9 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind)
if(!texture)
{
+#if SHOW_DEBUG
LL_DEBUGS() << "NULL LLTexUnit::bind texture" << LL_ENDL;
+#endif
return false;
}
@@ -1840,7 +1844,9 @@ LLTexUnit* LLRender::getTexUnit(U32 index)
}
else
{
+#if SHOW_DEBUG
LL_DEBUGS() << "Non-existing texture unit layer requested: " << index << LL_ENDL;
+#endif
return mDummyTexUnit;
}
}
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 9e0697c1f60fb63feba0de4e8dded2a995348a9d..82831b36e29b9e8664ce2252cb3b464082cf169c 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -527,10 +527,12 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
// which to build this string), then intentionally return a blank
// string to the caller and skip the below warning about a blank
// prefix.
+#if SHOW_DEBUG
LL_DEBUGS("LLDir") << "getLindenUserDir() not yet set: "
<< ELLPathToString(location)
<< ", '" << subdir1 << "', '" << subdir2 << "', '" << in_filename
<< "' => ''" << LL_ENDL;
+#endif
return std::string();
}
break;
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp
index 10cbcf3115ac8f73d221e755de808d036273d6e7..a5865d327d70999044e8d58c2deb3805945ba4bf 100644
--- a/indra/llwindow/llkeyboard.cpp
+++ b/indra/llwindow/llkeyboard.cpp
@@ -255,7 +255,9 @@ BOOL LLKeyboard::handleTranslatedKeyUp(KEY translated_key, U32 translated_mask)
handled = mCallbacks->handleTranslatedKeyUp(translated_key, translated_mask);
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "keyup -" << translated_key << "-" << LL_ENDL;
+#endif
return handled;
}
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 0adc7a703a3d30bd40bd6e99bd1306f530a3f2b6..f472568dbc06626abd96226ca65a670ee7009864 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -906,7 +906,9 @@ void AISUpdate::doUpdate()
for (std::map<LLUUID,S32>::const_iterator catit = mCatDescendentDeltas.begin();
catit != mCatDescendentDeltas.end(); ++catit)
{
+#if SHOW_DEBUG
LL_DEBUGS("Inventory") << "descendant accounting for " << catit->first << LL_ENDL;
+#endif
const LLUUID cat_id(catit->first);
// Don't account for update if we just created this category.
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 4d9f24b4044a632244bc2ca62349c99fd48dd5ac..82873fe9b91ec45e312f88a426b2e80de9b5265b 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -117,6 +117,7 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
F32 target_dist = (offset_dist - max_legal_offset);
new_pos_fixup = (target_dist/offset_dist)*pos_box_offset;
}
+#if SHOW_DEBUG
if (new_pos_fixup != mPositionConstraintFixup)
{
LL_DEBUGS("ConstraintFix") << getFullname() << " pos fix, offset_dist " << offset_dist << " pos fixup "
@@ -126,13 +127,16 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
LL_DEBUGS("ConstraintFix") << "unshift_extents " << unshift_extents[0] << " " << unshift_extents[1] << LL_ENDL;
}
+#endif
}
if (box_size/mScaleConstraintFixup > max_legal_size)
{
new_scale_fixup = mScaleConstraintFixup*max_legal_size/box_size;
+#if SHOW_DEBUG
LL_DEBUGS("ConstraintFix") << getFullname() << " scale fix, box_size " << box_size << " fixup "
<< mScaleConstraintFixup << " max legal " << max_legal_size
<< " -> new scale " << new_scale_fixup << LL_ENDL;
+#endif
}
}
}
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index e84ba28347415b2fd0e4963e3a22a0ec0da27df8..37678e03b4602c438adc16680615f7d05eec33f7 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -111,7 +111,6 @@ void LLSkinningUtil::scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin
// needed for handling of any legacy bad data.
if (!avatar->getJoint(skin->mJointNames[j]))
{
- LL_DEBUGS("Avatar") << avatar->getFullname() << " mesh rigged to invalid joint " << skin->mJointNames[j] << LL_ENDL;
LL_WARNS_ONCE("Avatar") << avatar->getFullname() << " mesh rigged to invalid joint" << skin->mJointNames[j] << LL_ENDL;
skin->mJointNames[j] = "mPelvis";
skin->mJointNumsInitialized = false; // force update after names change.
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 11b0fb14d8dceb55cbc36d58c34bd1734a015406..a73df1e89d34def9c86e23ca8a8d48f424e8802f 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -4001,8 +4001,10 @@ class AssetReportHandler : public LLCore::HttpHandler
if (status)
{
+#if SHOW_DEBUG
LL_DEBUGS(LOG_TXT) << "Successfully delivered asset metrics to grid."
<< LL_ENDL;
+#endif
}
else
{
diff --git a/indra/newview/lltoolselectrect.cpp b/indra/newview/lltoolselectrect.cpp
index bae32f7bc0890f4746a7292f3204c94a27e330df..1e27f981fd0cdfae6e2539a21a4d7bb2409270c7 100644
--- a/indra/newview/lltoolselectrect.cpp
+++ b/indra/newview/lltoolselectrect.cpp
@@ -145,12 +145,16 @@ BOOL LLToolSelectRect::handleHover(S32 x, S32 y, MASK mask)
return LLToolSelect::handleHover(x, y, mask);
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolSelectRect (active)" << LL_ENDL;
+#endif
}
+#if SHOW_DEBUG
else
{
LL_DEBUGS("UserInput") << "hover handled by LLToolSelectRect (inactive)" << LL_ENDL;
}
+#endif
gViewerWindow->setCursor(UI_CURSOR_ARROW);
return TRUE;
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 2562b54776a563ef9daa7cead197c417be896cff..1fde077fa42157c5576b9909adef8f1292845022 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -156,8 +156,10 @@ void LLViewerAssetStorage::storeAssetData(
F64Seconds timeout)
{
LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+#if SHOW_DEBUG
LL_DEBUGS("AssetStorage") << "LLViewerAssetStorage::storeAssetData (legacy) " << tid << ":" << LLAssetType::lookup(asset_type)
<< " ASSET_ID: " << asset_id << LL_ENDL;
+#endif
if (mUpstreamHost.isOk())
{
@@ -288,9 +290,11 @@ void LLViewerAssetStorage::storeAssetData(
}
LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+#if SHOW_DEBUG
LL_DEBUGS("AssetStorage") << "LLViewerAssetStorage::storeAssetData (legacy)" << asset_id << ":" << LLAssetType::lookup(asset_type) << LL_ENDL;
LL_DEBUGS("AssetStorage") << "ASSET_ID: " << asset_id << LL_ENDL;
+#endif
S32 size = 0;
LLFILE* fp = LLFile::fopen(filename, "rb");
@@ -394,7 +398,9 @@ void LLViewerAssetStorage::queueRequestHttp(
BOOL duplicate,
BOOL is_priority)
{
+#if SHOW_DEBUG
LL_DEBUGS("ViewerAsset") << "Request asset via HTTP " << uuid << " type " << LLAssetType::lookup(atype) << LL_ENDL;
+#endif
bool with_http = true;
LLViewerAssetRequest *req = new LLViewerAssetRequest(uuid, atype, with_http);
@@ -502,7 +508,9 @@ void LLViewerAssetStorage::assetRequestCoro(
return;
}
std::string url = getAssetURL(mViewerAssetUrl, uuid,atype);
+#if SHOW_DEBUG
LL_DEBUGS("ViewerAsset") << "request url: " << url << LL_ENDL;
+#endif
LLCore::HttpRequest::policy_t httpPolicy(LLAppCoreHttp::AP_TEXTURE);
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b6a2cd21870f30bc8521ef92b6c699b0ae261b93..4828cf0ea20918e63101dd7ff9fa7c2174361be1 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2708,9 +2708,11 @@ void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& frame_tim
{
// Was clipped, so this means we hit a edge where there is no region to enter
LLVector3 clip_pos = mRegionp->getPosRegionFromGlobal(clip_pos_global);
+#if SHOW_DEBUG
LL_DEBUGS("Interpolate") << "Hit empty region edge, clipped predicted position to "
<< clip_pos
<< " from " << new_pos << LL_ENDL;
+#endif
new_pos = clip_pos;
// Stop motion and get server update for bouncing on the edge
@@ -2728,14 +2730,18 @@ void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& frame_tim
// Workaround: we can't accurately figure out time when we cross border
// so just write down time 'after the fact', it is far from optimal in
// case of lags, but for lags sMaxUpdateInterpolationTime will kick in first
+#if SHOW_DEBUG
LL_DEBUGS("Interpolate") << "Predicted region crossing, new position " << new_pos << LL_ENDL;
+#endif
mRegionCrossExpire = frame_time + sMaxRegionCrossingInterpolationTime;
}
else if (frame_time > mRegionCrossExpire)
{
// Predicting crossing over 1s, stop motion
// Stop motion
+#if SHOW_DEBUG
LL_DEBUGS("Interpolate") << "Predicting region crossing for too long, stopping at " << new_pos << LL_ENDL;
+#endif
new_v.clear();
setAcceleration(LLVector3::zero);
mRegionCrossExpire = 0;
@@ -3133,13 +3139,17 @@ void LLViewerObject::updateControlAvatar()
if (should_have_control_avatar && !has_control_avatar)
{
std::string vobj_name = llformat("Vol%p", root);
+#if SHOW_DEBUG
LL_DEBUGS("AnimatedObjects") << vobj_name << " calling linkControlAvatar()" << LL_ENDL;
+#endif
root->linkControlAvatar();
}
if (!should_have_control_avatar && has_control_avatar)
{
std::string vobj_name = llformat("Vol%p", root);
+#if SHOW_DEBUG
LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL;
+#endif
root->unlinkControlAvatar();
}
if (getControlAvatar())
@@ -3163,9 +3173,11 @@ void LLViewerObject::linkControlAvatar()
return;
}
mControlAvatar = LLControlAvatar::createControlAvatar(volp);
+#if SHOW_DEBUG
LL_DEBUGS("AnimatedObjects") << volp->getID()
<< " created control av for "
<< (S32) (1+volp->numChildren()) << " prims" << LL_ENDL;
+#endif
}
LLControlAvatar *cav = getControlAvatar();
if (cav)
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index d2399da8690c1067a86262ddfec8723704eabb43..d6befa26aed984b8e880311ead44ad1edd20dc10 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1523,7 +1523,9 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/)
S32 discard_level = mRawDiscardLevel;
if (mRawDiscardLevel < 0)
{
+#if SHOW_DEBUG
LL_DEBUGS() << "Negative raw discard level when creating image: " << mRawDiscardLevel << LL_ENDL;
+#endif
discard_level = 0;
}
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 5a7f28abe0d6ed9097e9be99386c371417f3c7bd..4af980e24a08aba7f75d772eef6cd6c437eff5a2 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -250,7 +250,9 @@ void LLViewerTextureList::doPrefetchImages()
}
}
}
+#if SHOW_DEBUG
LL_DEBUGS() << "fetched " << texture_count << " images from " << filename << LL_ENDL;
+#endif
}
///////////////////////////////////////////////////////////////////////////////
@@ -313,7 +315,9 @@ void LLViewerTextureList::shutdown()
std::string filename = get_texture_list_name();
llofstream file;
file.open(filename.c_str());
+#if SHOW_DEBUG
LL_DEBUGS() << "saving " << imagelist.size() << " image list entries" << LL_ENDL;
+#endif
LLSDSerialize::toPrettyXML(imagelist, file);
}
@@ -432,6 +436,7 @@ LLViewerFetchedTexture* LLViewerTextureList::getImageFromUrl(const std::string&
{
LL_WARNS() << "Requested texture " << new_id << " already exists but does not have a URL" << LL_ENDL;
}
+#if SHOW_DEBUG
else if (texture->getUrl() != url)
{
// This is not an error as long as the images really match -
@@ -440,7 +445,7 @@ LLViewerFetchedTexture* LLViewerTextureList::getImageFromUrl(const std::string&
<< " already exists with a different url, requested: " << url
<< " current: " << texture->getUrl() << LL_ENDL;
}
-
+#endif
}
if (imagep.isNull())
{
@@ -1248,12 +1253,17 @@ void LLViewerTextureList::decodeAllImages(F32 max_time)
}
max_time -= timer.getElapsedTimeF32();
max_time = llmax(max_time, .001f);
- F32 create_time = updateImagesCreateTextures(max_time);
+#if SHOW_DEBUG
+ F32 create_time =
+#endif
+ updateImagesCreateTextures(max_time);
+#if SHOW_DEBUG
LL_DEBUGS("ViewerImages") << "decodeAllImages() took " << timer.getElapsedTimeF32() << " seconds. "
<< " fetch_pending " << fetch_pending
<< " create_time " << create_time
<< LL_ENDL;
+#endif
}
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index f971554c9dec325563225c1c4d109fb27769d245..f2806541a31213c35596524e2f992e69f104ec50 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -648,12 +648,14 @@ void LLVoiceChannelGroup::voiceCallCapCoro(std::string url)
result.erase(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS);
+#if SHOW_DEBUG
LLSD::map_const_iterator iter;
for (iter = result.beginMap(); iter != result.endMap(); ++iter)
{
LL_DEBUGS("Voice") << "LLVoiceCallCapResponder::result got "
<< iter->first << LL_ENDL;
}
+#endif
channelp->setChannelInfo(
result["voice_credentials"]["channel_uri"].asString(),
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 37a7b81bcdf272c133a33d12c1f967a750f35c52..b7eae9b3b67078f0362e5b2856725dcafd765bf0 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -6753,7 +6753,9 @@ void LLVivoxVoiceClient::enablePreviewBuffer(bool enable)
if(mCaptureBufferMode && mIsInChannel)
{
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "no channel" << LL_ENDL;
+#endif
sessionTerminate();
}
}
@@ -6762,7 +6764,9 @@ void LLVivoxVoiceClient::recordPreviewBuffer()
{
if (!mCaptureBufferMode)
{
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "Not in voice effect preview mode, cannot start recording." << LL_ENDL;
+#endif
mCaptureBufferRecording = false;
return;
}
@@ -6777,7 +6781,9 @@ void LLVivoxVoiceClient::playPreviewBuffer(const LLUUID& effect_id)
{
if (!mCaptureBufferMode)
{
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "Not in voice effect preview mode, no buffer to play." << LL_ENDL;
+#endif
mCaptureBufferRecording = false;
return;
}
@@ -6820,7 +6826,9 @@ void LLVivoxVoiceClient::captureBufferRecordStartSendMessage()
{
std::ostringstream stream;
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "Starting audio capture to buffer." << LL_ENDL;
+#endif
// Start capture
stream
@@ -6847,7 +6855,9 @@ void LLVivoxVoiceClient::captureBufferRecordStopSendMessage()
{
std::ostringstream stream;
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "Stopping audio capture to buffer." << LL_ENDL;
+#endif
// Mute the mic. Mic mute state was dirtied at recording start, so will be reset when finished previewing.
stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.MuteLocalMic.1\">"
@@ -6876,10 +6886,14 @@ void LLVivoxVoiceClient::captureBufferPlayStartSendMessage(const LLUUID& voice_f
std::ostringstream stream;
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "Starting audio buffer playback." << LL_ENDL;
+#endif
S32 font_index = getVoiceFontTemplateIndex(voice_font_id);
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "With voice font: " << voice_font_id << " (" << font_index << ")" << LL_ENDL;
+#endif
stream
<< "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.PlayAudioBuffer.1\">"
@@ -6899,7 +6913,9 @@ void LLVivoxVoiceClient::captureBufferPlayStopSendMessage()
{
std::ostringstream stream;
+#if SHOW_DEBUG
LL_DEBUGS("Voice") << "Stopping audio buffer playback." << LL_ENDL;
+#endif
stream
<< "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.RenderAudioStop.1\">"
@@ -6989,14 +7005,18 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl(
XML_SetUserData(parser, this);
XML_Parse(parser, mInput.data() + start, delim - start, false);
+#if SHOW_DEBUG
LL_DEBUGS("VivoxProtocolParser") << "parsing: " << mInput.substr(start, delim - start) << LL_ENDL;
+#endif
start = delim + 3;
}
if(start != 0)
mInput = mInput.substr(start);
+#if SHOW_DEBUG
LL_DEBUGS("VivoxProtocolParser") << "at end, mInput is: " << mInput << LL_ENDL;
+#endif
if(!LLVivoxVoiceClient::getInstance()->mConnected)
{
@@ -7364,7 +7384,9 @@ LLDate LLVivoxProtocolParser::expiryTimeStampToLLDate(const std::string& vivox_t
std::string time_stamp = vivox_ts.substr(0, 10);
time_stamp += VOICE_FONT_EXPIRY_TIME;
+#if SHOW_DEBUG
LL_DEBUGS("VivoxProtocolParser") << "Vivox timestamp " << vivox_ts << " modified to: " << time_stamp << LL_ENDL;
+#endif
return LLDate(time_stamp);
}
@@ -7373,8 +7395,10 @@ LLDate LLVivoxProtocolParser::expiryTimeStampToLLDate(const std::string& vivox_t
void LLVivoxProtocolParser::processResponse(std::string tag)
{
+#if SHOW_DEBUG
LL_DEBUGS("VivoxProtocolParser") << tag << LL_ENDL;
-
+#endif
+
// SLIM SDK: the SDK now returns a statusCode of "200" (OK) for success. This is a change vs. previous SDKs.
// According to Mike S., "The actual API convention is that responses with return codes of 0 are successful, regardless of the status code returned",
// so I believe this will give correct behavior.
@@ -7385,12 +7409,16 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
if (isEvent)
{
const char *eventTypeCstr = eventTypeString.c_str();
+#if SHOW_DEBUG
LL_DEBUGS("LowVoice") << eventTypeCstr << LL_ENDL;
+#endif
if (!stricmp(eventTypeCstr, "ParticipantUpdatedEvent"))
{
// These happen so often that logging them is pretty useless.
+#if SHOW_DEBUG
LL_DEBUGS("LowVoice") << "Updated Params: " << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << isModeratorMuted << ", " << isSpeaking << ", " << volume << ", " << energy << LL_ENDL;
+#endif
LLVivoxVoiceClient::getInstance()->participantUpdatedEvent(sessionHandle, sessionGroupHandle, uriString, alias, isModeratorMuted, isSpeaking, volume, energy);
}
else if (!stricmp(eventTypeCstr, "AccountLoginStateChangeEvent"))
@@ -7459,7 +7487,9 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
<ParticipantType>0</ParticipantType>
</Event>
*/
+#if SHOW_DEBUG
LL_DEBUGS("LowVoice") << "Added Params: " << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << nameString << ", " << displayNameString << ", " << participantType << LL_ENDL;
+#endif
LLVivoxVoiceClient::getInstance()->participantAddedEvent(sessionHandle, sessionGroupHandle, uriString, alias, nameString, displayNameString, participantType);
}
else if (!stricmp(eventTypeCstr, "ParticipantRemovedEvent"))
@@ -7472,7 +7502,9 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
<AccountName>xtx7YNV-3SGiG7rA1fo5Ndw==</AccountName>
</Event>
*/
+#if SHOW_DEBUG
LL_DEBUGS("LowVoice") << "Removed params:" << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << nameString << LL_ENDL;
+#endif
LLVivoxVoiceClient::getInstance()->participantRemovedEvent(sessionHandle, sessionGroupHandle, uriString, alias, nameString);
}
@@ -7539,7 +7571,9 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
else
{
const char *actionCstr = actionString.c_str();
+#if SHOW_DEBUG
LL_DEBUGS("LowVoice") << actionCstr << LL_ENDL;
+#endif
if (!stricmp(actionCstr, "Session.Set3DPosition.1"))
{
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp
index 69a4d2e32cb118d737086f35de420a2744411e50..6f97cc81b92f6ddc73fe743b82fc3d04a668d102 100644
--- a/indra/newview/llwebprofile.cpp
+++ b/indra/newview/llwebprofile.cpp
@@ -73,7 +73,9 @@ void LLWebProfile::uploadImage(LLPointer<LLImageFormatted> image, const std::str
// static
void LLWebProfile::setAuthCookie(const std::string& cookie)
{
+#if SHOW_DEBUG
LL_DEBUGS("Snapshots") << "Setting auth cookie: " << cookie << LL_ENDL;
+#endif
sAuthCookie = cookie;
}
@@ -118,7 +120,9 @@ void LLWebProfile::uploadImageCoro(LLPointer<LLImageFormatted> image, std::strin
configUrl += "?caption=" + LLURI::escape(caption);
configUrl += "&add_loc=" + std::string(addLocation ? "1" : "0");
+#if SHOW_DEBUG
LL_DEBUGS("Snapshots") << "Requesting " << configUrl << LL_ENDL;
+#endif
httpHeaders = buildDefaultHeaders();
httpHeaders->append(HTTP_OUT_HEADER_COOKIE, getAuthCookie());
@@ -175,7 +179,9 @@ void LLWebProfile::uploadImageCoro(LLPointer<LLImageFormatted> image, std::strin
LLWebProfile::reportImageUploadStatus(false);
}
+#if SHOW_DEBUG
LL_DEBUGS("Snapshots") << "Got redirection URL: " << redirUrl << LL_ENDL;
+#endif
result = httpAdapter->getRawAndSuspend(httpRequest, redirUrl, httpOpts, httpHeaders);
diff --git a/indra/newview/llwind.cpp b/indra/newview/llwind.cpp
index 4c39fb5b749f304bdbff03dd844ea2ec5d9672f0..11b2cfea6c723bfa7e44b413d2316d9517dc6602 100644
--- a/indra/newview/llwind.cpp
+++ b/indra/newview/llwind.cpp
@@ -71,7 +71,9 @@ LLWind::~LLWind()
void LLWind::init()
{
+#if SHOW_DEBUG
LL_DEBUGS("Wind") << "initializing wind size: "<< mSize << LL_ENDL;
+#endif
// Initialize vector data
mVelX = new F32[mSize*mSize];
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index 6b8374fd48ca8753bfb50b6b6ac663f1145df326..47a4bcd1007e0919a0749eb890fd86886b6c8862 100644
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -66,8 +66,9 @@ void LLEnvironmentRequest::onRegionCapsReceived(const LLUUID& region_id, LLEnvir
LL_INFOS("WindlightCaps") << "Got caps for a non-current region" << LL_ENDL;
return;
}
-
+#if SHOW_DEBUG
LL_DEBUGS("WindlightCaps") << "Received region capabilities" << LL_ENDL;
+#endif
doRequest(cb);
}
@@ -181,7 +182,9 @@ bool LLEnvironmentApply::initiateRequest(const LLSD& content, LLEnvironment::env
}
LL_INFOS("WindlightCaps") << "Sending windlight settings to " << url << LL_ENDL;
+#if SHOW_DEBUG
LL_DEBUGS("WindlightCaps") << "content: " << content << LL_ENDL;
+#endif
std::string coroname =
LLCoros::instance().launch("LLEnvironmentApply::environmentApplyCoro",
@@ -251,8 +254,9 @@ void LLEnvironmentApply::environmentApplyCoro(std::string url, LLSD content, LLE
notify["FAIL_REASON"] = result["fail_reason"].asString();
break;
}
-
+#if SHOW_DEBUG
LL_DEBUGS("WindlightCaps") << "Success in applying windlight settings to region " << result["regionID"].asUUID() << LL_ENDL;
+#endif
} while (false);
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index c1befe40a3192909636b767ddfe178541c4b03d5..1eed8487856603e941917ba67c93e05509c8ca9d 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1181,8 +1181,10 @@ class LLEstablishAgentCommunication final : public LLHTTPNode
<< sim << LL_ENDL;
return;
}
+#if SHOW_DEBUG
LL_DEBUGS("CrossingCaps") << "Calling setSeedCapability from LLEstablishAgentCommunication::post. Seed cap == "
<< input["body"]["seed-capability"] << LL_ENDL;
+#endif
regionp->setSeedCapability(input["body"]["seed-capability"]);
}
};
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 1ac878a3f4ef0c5d87ff0d0660aaec9b04bef00e..52e1f6f3609daba0dd152ce20d4d0e9d2c8226c5 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -1749,7 +1749,9 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask )
{
gViewerWindow->setCursor( UI_CURSOR_CROSS );
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLWorldMapView" << LL_ENDL;
+#endif
return TRUE;
}
}
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
index b2e1bfcc074985c3afe3eaf3d3e538c7a5fc96e4..bc20b2ac1dab623e6946fe695029c5b41420a72e 100644
--- a/indra/newview/llxmlrpclistener.cpp
+++ b/indra/newview/llxmlrpclistener.cpp
@@ -387,14 +387,18 @@ class Poller
XMLRPC_REQUEST response = mTransaction->response();
if (! response)
{
+#if SHOW_DEBUG
LL_DEBUGS("LLXMLRPCListener") << "No response" << LL_ENDL;
+#endif
return LLSD();
}
XMLRPC_VALUE param = XMLRPC_RequestGetData(response);
if (! param)
{
+#if SHOW_DEBUG
LL_DEBUGS("LLXMLRPCListener") << "Response contains no data" << LL_ENDL;
+#endif
return LLSD();
}