summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llmessage/llservicebuilder.cpp17
-rw-r--r--indra/newview/llviewerregion.cpp1
-rw-r--r--indra/newview/llviewerstats.cpp11
-rw-r--r--indra/newview/llviewerstats.h2
4 files changed, 18 insertions, 13 deletions
diff --git a/indra/llmessage/llservicebuilder.cpp b/indra/llmessage/llservicebuilder.cpp
index 806a888b2b..f9195143c6 100644
--- a/indra/llmessage/llservicebuilder.cpp
+++ b/indra/llmessage/llservicebuilder.cpp
@@ -118,16 +118,19 @@ std::string LLServiceBuilder::buildServiceURI(
{
std::string query_str = LLURI::mapToQueryString(
(*option_itr).second);
- if(!query_str.empty())
- {
- service_url.replace(
- find_pos,
- variable_name.length(),
- query_str);
- }
+ service_url.replace(
+ find_pos,
+ variable_name.length(),
+ query_str);
}
}
}
+ if (service_url.find('{') != std::string::npos)
+ {
+ llwarns << "Constructed a likely bogus service URL: " << service_url
+ << llendl;
+ }
+
return service_url;
}
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 81af21069e..b7167b7170 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1254,6 +1254,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
capabilityNames.append("UntrustedSimulatorMessage");
capabilityNames.append("ParcelVoiceInfoRequest");
capabilityNames.append("ChatSessionRequest");
+ capabilityNames.append("ViewerStats");
capabilityNames.append("ProvisionVoiceAccountRequest");
capabilityNames.append("ServerReleaseNotes");
capabilityNames.append("CopyInventoryFromNotecard");
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index f1df0d39e0..08d943d8c3 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -268,17 +268,18 @@ void LLViewerStats::updateFrameStats(const F64 time_diff)
}
-void LLViewerStats::addToMessage() const
+void LLViewerStats::addToMessage(LLSD &body) const
{
+ LLSD &misc = body["misc"];
+
for (S32 i = 0; i < ST_COUNT; i++)
{
if (STAT_INFO[i].mEnabled)
{
// TODO: send timer value so dataserver can normalize
- gMessageSystem->nextBlockFast(_PREHASH_MiscStats);
- gMessageSystem->addU32Fast(_PREHASH_Type, (U32)i);
- gMessageSystem->addF64Fast(_PREHASH_Value, mStats[i]);
- llinfos << "STAT: " << STAT_INFO[i].mName << ": " << mStats[i] << llendl;
+ misc[STAT_INFO[i].mName] = mStats[i];
+ llinfos << "STAT: " << STAT_INFO[i].mName << ": " << mStats[i]
+ << llendl;
}
}
}
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index 33ed6bcbcf..0498da0175 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -152,7 +152,7 @@ public:
void updateFrameStats(const F64 time_diff);
- void addToMessage() const;
+ void addToMessage(LLSD &body) const;
static const char *statTypeToText(EStatType type);