diff options
author | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
commit | f1539b727946956826c7c5fb0188b7770cfbdc24 (patch) | |
tree | 8f6371c2d631f5ad26bd3a9c852fa92edee3b090 /indra/newview/llappviewer.h | |
parent | 5525257b8580df3dbc9860370564e19c9d6cbbaa (diff) | |
parent | 21b7de56ad6c1efd81ad4406aba1428633b9356e (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 06c06c4af2..627652dc30 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -179,7 +179,7 @@ public: // Metrics policy helper statics. static void metricsUpdateRegion(U64 region_handle); static void metricsSend(bool enable_reporting); - + // llcorehttp init/shutdown/config information. LLAppCoreHttp & getAppCoreHttp() { return mAppCoreHttp; } |