diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index bca7d9c0bc..ead9eb1af1 100755 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -371,7 +371,7 @@ void LLAvatarNameCache::requestNamesViaCapability() if (!url.empty()) { - LL_INFOS("AvNameCache") << "LLAvatarNameCache::requestNamesViaCapability getting " << ids << " ids" << LL_ENDL; + LL_DEBUGS("AvNameCache") << " getting " << ids << " ids" << LL_ENDL; LLHTTPClient::get(url, new LLAvatarNameResponder(agent_ids)); } } diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index de226ff96e..54aa677928 100755 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -1370,7 +1370,7 @@ S32 LLMessageSystem::sendMessage(const LLHost &host) mPacketsOut++; - mBytesOut += buffer_length; + mTotalBytesOut += buffer_length; mSendReliable = FALSE; mReliablePacketParams.clear(); diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index abbc0aed03..62ef3bb2f1 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -5,7 +5,23 @@ print-location true settings - + + + levelERROR + functions + + + classes + + + files + + + tags + + ShaderLoading + + levelINFO functions @@ -19,14 +35,6 @@ tags - AppInit - Capabilities - SystemInfo - TextureCache - AppCache - Window - RenderInit - MediaAuth diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp index d351b38653..2760a97bda 100644 --- a/indra/newview/llavatarrenderinfoaccountant.cpp +++ b/indra/newview/llavatarrenderinfoaccountant.cpp @@ -311,7 +311,7 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio } else { - LL_INFOS("AvatarRenderInfo") << "Sent render costs for " << num_avs + LL_DEBUGS("AvatarRenderInfo") << "Sent render costs for " << num_avs << " avatars to region " << regionp->getName() << LL_ENDL; @@ -356,7 +356,7 @@ void LLAvatarRenderInfoAccountant::getRenderInfoFromRegion(LLViewerRegion * regi handler); if (LLCORE_HTTP_HANDLE_INVALID != handle) { - LL_INFOS("AvatarRenderInfo") << "Requested avatar render info for region " + LL_DEBUGS("AvatarRenderInfo") << "Requested avatar render info for region " << regionp->getName() << LL_ENDL; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ac32c557ec..c3b83a22e3 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3019,7 +3019,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) buffer = message; - LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; + LL_DEBUGS("Messaging") << "session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; // FIRE-10178: Keyword Alerts in group IM do not work unless the group is in the foreground (notification on receipt of IM) chat.mText = buffer; @@ -3129,7 +3129,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } buffer = saved + message; - LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; + LL_DEBUGS("Messaging") << "session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; bool mute_im = is_muted; if(accept_im_from_only_friend&&!is_friend) @@ -3731,7 +3731,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) buffer = message; - LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; + LL_DEBUGS("Messaging") << "message in dnd; session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; // add to IM panel, but do not bother the user gIMMgr->addMessage( @@ -3769,7 +3769,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) buffer = saved + message; - LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; + LL_DEBUGS("Messaging") << "standard message session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; gIMMgr->addMessage( session_id, diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 7285ebef36..73eb53f59c 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1133,6 +1133,7 @@ void LLVOAvatar::resetImpostors() { LLVOAvatar* avatar = (LLVOAvatar*) *iter; avatar->mImpostor.release(); + avatar->mNeedsImpostorUpdate = TRUE; } } @@ -8912,7 +8913,7 @@ void LLVOAvatar::updateFreezeCounter(S32 counter) BOOL LLVOAvatar::updateLOD() { - if (isImpostor()) + if (isImpostor() && 0 != mDrawable->getNumFaces() && mDrawable->getFace(0)->hasGeometry()) { return TRUE; } @@ -9194,6 +9195,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity() } } } + LL_DEBUGS("ARCdetail") << "Avatar body parts complexity: " << cost << LL_ENDL; for (attachment_map_t::const_iterator attachment_point = mAttachmentPoints.begin(); @@ -9223,7 +9225,12 @@ void LLVOAvatar::calculateUpdateRenderComplexity() const LLVOVolume* volume = drawable->getVOVolume(); if (volume) { - cost += volume->getRenderCost(textures); + U32 attachment_total_cost = 0; + U32 attachment_volume_cost = 0; + U32 attachment_texture_cost = 0; + U32 attachment_children_cost = 0; + + attachment_volume_cost += volume->getRenderCost(textures); const_child_list_t children = volume->getChildren(); for (const_child_list_t::const_iterator child_iter = children.begin(); @@ -9234,7 +9241,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity() LLVOVolume *child = dynamic_cast( child_obj ); if (child) { - cost += child->getRenderCost(textures); + attachment_children_cost += child->getRenderCost(textures); } } @@ -9243,8 +9250,18 @@ void LLVOAvatar::calculateUpdateRenderComplexity() ++volume_texture) { // add the cost of each individual texture in the linkset - cost += volume_texture->second; + attachment_texture_cost += volume_texture->second; } + + attachment_total_cost = attachment_volume_cost + attachment_texture_cost + attachment_children_cost; + LL_DEBUGS("ARCdetail") << "Attachment costs " << attached_object->getAttachmentItemID() + << " total: " << attachment_total_cost + << ", volume: " << attachment_volume_cost + << ", textures: " << attachment_texture_cost + << ", " << volume->numChildren() + << " children: " << attachment_children_cost + << LL_ENDL; + cost += attachment_total_cost; } } } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index a385d33cdf..154b1642d9 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3502,7 +3502,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const { // base cost is dependent on mesh complexity // note that 3 is the highest LOD as of the time of this coding. - S32 size = gMeshRepo.getMeshSize(volume_params.getSculptID(),3); + S32 size = gMeshRepo.getMeshSize(volume_params.getSculptID(), getLOD()); if ( size > 0) { if (gMeshRepo.getSkinInfo(volume_params.getSculptID(), this)) diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index ababddc6e7..9794bf0453 100755 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -89,7 +89,7 @@ void LLWaterParamManager::loadAllPresets() void LLWaterParamManager::loadPresetsFromDir(const std::string& dir) { - LL_INFOS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL; + LL_DEBUGS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL; LLDirIterator dir_iter(dir, "*.xml"); while (1) diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index 88079c5d26..106f17f61b 100755 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -107,7 +107,7 @@ void LLWLDayCycle::loadDayCycleFromFile(const std::string & fileName) // static LLSD LLWLDayCycle::loadDayCycleFromPath(const std::string& file_path) { - LL_INFOS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL; + LL_DEBUGS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL; llifstream day_cycle_xml(file_path.c_str()); if (day_cycle_xml.is_open())