aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorRobert Adams2013-08-08 09:41:11 -0700
committerRobert Adams2013-08-08 09:45:30 -0700
commitd9bd6e6b5be3100141a3b1202f859c65a302d4ee (patch)
treef44a5a4cb944270ce90c0e61da473171609c7792 /OpenSim/Framework
parentBetter error reporting when registering LSL function extensions (comms module). (diff)
downloadopensim-SC_OLD-d9bd6e6b5be3100141a3b1202f859c65a302d4ee.zip
opensim-SC_OLD-d9bd6e6b5be3100141a3b1202f859c65a302d4ee.tar.gz
opensim-SC_OLD-d9bd6e6b5be3100141a3b1202f859c65a302d4ee.tar.bz2
opensim-SC_OLD-d9bd6e6b5be3100141a3b1202f859c65a302d4ee.tar.xz
Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.
Add 'callback' query parameter to managed stats return to return function form of JSON data.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Monitoring/StatsManager.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 23c6f18..7cf1fa7 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -281,6 +281,12 @@ namespace OpenSim.Framework.Monitoring
281 281
282 string strOut = StatsManager.GetStatsAsOSDMap(pCategoryName, pContainerName, pStatName).ToString(); 282 string strOut = StatsManager.GetStatsAsOSDMap(pCategoryName, pContainerName, pStatName).ToString();
283 283
284 // If requestor wants it as a callback function, build response as a function rather than just the JSON string.
285 if (request.ContainsKey("callback"))
286 {
287 strOut = request["callback"].ToString() + "(" + strOut + ");";
288 }
289
284 // m_log.DebugFormat("{0} StatFetch: uri={1}, cat={2}, cont={3}, stat={4}, resp={5}", 290 // m_log.DebugFormat("{0} StatFetch: uri={1}, cat={2}, cont={3}, stat={4}, resp={5}",
285 // LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut); 291 // LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut);
286 292