diff options
| -rwxr-xr-x | indra/newview/llaisapi.cpp | 60 | ||||
| -rwxr-xr-x | indra/newview/llaisapi.h | 6 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewerstats.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 22 |
6 files changed, 54 insertions, 50 deletions
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 6f6e6ebb35..14978662f6 100755 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -602,29 +602,37 @@ void AISUpdate::parseCategory(const LLSD& category_map) void AISUpdate::parseDescendentCount(const LLUUID& category_id, const LLSD& embedded) { // We can only determine true descendent count if this contains all descendent types. - if (embedded.has("category") && - embedded.has("link") && - embedded.has("item")) + if (embedded.has("categories") && + embedded.has("links") && + embedded.has("items")) { - mCatDescendentsKnown[category_id] = embedded["category"].size(); - mCatDescendentsKnown[category_id] += embedded["link"].size(); - mCatDescendentsKnown[category_id] += embedded["item"].size(); + mCatDescendentsKnown[category_id] = embedded["categories"].size(); + mCatDescendentsKnown[category_id] += embedded["links"].size(); + mCatDescendentsKnown[category_id] += embedded["items"].size(); } } void AISUpdate::parseEmbedded(const LLSD& embedded) { - if (embedded.has("link")) + if (embedded.has("links")) // _embedded in a category { - parseEmbeddedLinks(embedded["link"]); + parseEmbeddedLinks(embedded["links"]); } - if (embedded.has("item")) + if (embedded.has("items")) // _embedded in a category { - parseEmbeddedItems(embedded["item"]); + parseEmbeddedItems(embedded["items"]); } - if (embedded.has("category")) + if (embedded.has("item")) // _embedded in a link { - parseEmbeddedCategories(embedded["category"]); + parseEmbeddedItem(embedded["item"]); + } + if (embedded.has("categories")) // _embedded in a category + { + parseEmbeddedCategories(embedded["categories"]); + } + if (embedded.has("category")) // _embedded in a link + { + parseEmbeddedCategory(embedded["category"]); } } @@ -660,18 +668,21 @@ void AISUpdate::parseEmbeddedLinks(const LLSD& links) } } -void AISUpdate::parseEmbeddedItems(const LLSD& items) +void AISUpdate::parseEmbeddedItem(const LLSD& item) { - // Special case: this may be a single item (_embedded in a link) - if (items.has("item_id")) + // a single item (_embedded in a link) + if (item.has("item_id")) { - if (mItemIds.end() != mItemIds.find(items["item_id"].asUUID())) + if (mItemIds.end() != mItemIds.find(item["item_id"].asUUID())) { - parseContent(items); + parseItem(item); } - return; } +} +void AISUpdate::parseEmbeddedItems(const LLSD& items) +{ + // a map of items (_embedded in a category) for(LLSD::map_const_iterator itemit = items.beginMap(), itemend = items.endMap(); itemit != itemend; ++itemit) @@ -689,8 +700,21 @@ void AISUpdate::parseEmbeddedItems(const LLSD& items) } } +void AISUpdate::parseEmbeddedCategory(const LLSD& category) +{ + // a single category (_embedded in a link) + if (category.has("category_id")) + { + if (mCategoryIds.end() != mCategoryIds.find(category["category_id"].asUUID())) + { + parseCategory(category); + } + } +} + void AISUpdate::parseEmbeddedCategories(const LLSD& categories) { + // a map of categories (_embedded in a category) for(LLSD::map_const_iterator categoryit = categories.beginMap(), categoryend = categories.endMap(); categoryit != categoryend; ++categoryit) diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h index f3a662c280..5a2ec94af9 100755 --- a/indra/newview/llaisapi.h +++ b/indra/newview/llaisapi.h @@ -153,8 +153,10 @@ public: void parseDescendentCount(const LLUUID& category_id, const LLSD& embedded); void parseEmbedded(const LLSD& embedded); void parseEmbeddedLinks(const LLSD& links); - void parseEmbeddedItems(const LLSD& links); - void parseEmbeddedCategories(const LLSD& links); + void parseEmbeddedItems(const LLSD& items); + void parseEmbeddedCategories(const LLSD& categories); + void parseEmbeddedItem(const LLSD& item); + void parseEmbeddedCategory(const LLSD& category); void doUpdate(); private: void clearParseResults(); diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index a888445060..6bdc99ad5e 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1930,8 +1930,8 @@ void LLMeshLODResponder::completedRaw(const LLChannelDescriptors& channels, } else { - llassert(status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint llwarns << "Unhandled status " << dumpResponse() << llendl; + llassert(status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint } return; } diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 68633fba6e..f0c4d4ef3d 100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -750,12 +750,12 @@ void LLViewerStats::PhaseMap::startPhase(const std::string& phase_name) { LLTimer& timer = getPhaseTimer(phase_name); timer.start(); - LL_DEBUGS("Avatar") << "startPhase " << phase_name << llendl; + //LL_DEBUGS("Avatar") << "startPhase " << phase_name << llendl; } void LLViewerStats::PhaseMap::clearPhases() { - LL_DEBUGS("Avatar") << "clearPhases" << llendl; + //LL_DEBUGS("Avatar") << "clearPhases" << llendl; mPhaseMap.clear(); } @@ -822,11 +822,11 @@ bool LLViewerStats::PhaseMap::getPhaseValues(const std::string& phase_name, F32& found = true; elapsed = iter->second.getElapsedTimeF32(); completed = !iter->second.getStarted(); - LL_DEBUGS("Avatar") << " phase_name " << phase_name << " elapsed " << elapsed << " completed " << completed << " timer addr " << (S32)(&iter->second) << llendl; + //LL_DEBUGS("Avatar") << " phase_name " << phase_name << " elapsed " << elapsed << " completed " << completed << " timer addr " << (S32)(&iter->second) << llendl; } else { - LL_DEBUGS("Avatar") << " phase_name " << phase_name << " NOT FOUND" << llendl; + //LL_DEBUGS("Avatar") << " phase_name " << phase_name << " NOT FOUND" << llendl; } return found; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 0bd51d9c15..93247a3625 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -717,7 +717,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, const BOOL needsSendToSim = false; // currently, this HUD effect doesn't need to pack and unpack data to do its job mVoiceVisualizer = ( LLVoiceVisualizer *)LLHUDManager::getInstance()->createViewerEffect( LLHUDObject::LL_HUD_EFFECT_VOICE_VISUALIZER, needsSendToSim ); - lldebugs << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << llendl; + LL_DEBUGS("Avatar") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << llendl; mPelvisp = NULL; @@ -813,7 +813,7 @@ LLVOAvatar::~LLVOAvatar() logPendingPhases(); - lldebugs << "LLVOAvatar Destructor (0x" << this << ") id:" << mID << llendl; + LL_DEBUGS("Avatar") << "LLVOAvatar Destructor (0x" << this << ") id:" << mID << llendl; std::for_each(mAttachmentPoints.begin(), mAttachmentPoints.end(), DeletePairedPointer()); mAttachmentPoints.clear(); @@ -825,7 +825,7 @@ LLVOAvatar::~LLVOAvatar() getPhases().clearPhases(); - lldebugs << "LLVOAvatar Destructor end" << llendl; + LL_DEBUGS("Avatar") << "LLVOAvatar Destructor end" << llendl; } void LLVOAvatar::markDead() diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ac59aa0907..a710c95233 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -63,7 +63,6 @@ #include "llsdutil.h" #include "llstartup.h" #include "llsdserialize.h" -#include "llversioninfo.h" #if LL_MSVC // disable boost::lexical_cast warning @@ -2374,29 +2373,11 @@ LLSD summarize_by_buckets(std::vector<LLSD> in_records, return result; } -// Valid characters for tsdb are alphanumeric, _-./. Others must be cleaned out. -void sanitize_for_tsdb_tag(std::string& s) -{ - for (std::string::iterator it = s.begin(); it != s.end(); ++it) - { - if (std::isalnum(*it) || *it == '.' || *it == '_' || *it == '-' || *it == '/') - { - continue; - } - *it = '_'; - } -} - void LLVOAvatarSelf::sendViewerAppearanceChangeMetrics() { static volatile bool reporting_started(false); static volatile S32 report_sequence(0); - std::string viewer_version_channel = LLVersionInfo::getChannel(); - sanitize_for_tsdb_tag(viewer_version_channel); - std::string viewer_version_short = LLVersionInfo::getShortVersion(); - std::string viewer_version_build = llformat("%d", LLVersionInfo::getBuild()); - LLSD msg; // = metricsData(); msg["message"] = "ViewerAppearanceChangeMetrics"; msg["session_id"] = gAgentSessionID; @@ -2405,9 +2386,6 @@ void LLVOAvatarSelf::sendViewerAppearanceChangeMetrics() msg["initial"] = !reporting_started; msg["break"] = false; msg["duration"] = mTimeSinceLastRezMessage.getElapsedTimeF32(); - msg["viewer_version_channel"] = viewer_version_channel; - msg["viewer_version_short"] = viewer_version_short; - msg["viewer_version_build"] = viewer_version_build; // Status of our own rezzing. msg["rez_status"] = LLVOAvatar::rezStatusToString(getRezzedStatus()); |