diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-19 14:48:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 14:48:14 -0400 |
| commit | a7d5d4cf84b751f129264d2b24a7b1bb799fce9c (patch) | |
| tree | 34c4f8101d0bdbd1b944a16cdc93a15b2d0f3cc0 /indra/newview/llappviewer.cpp | |
| parent | 25969b330e4dc69f6eb39a487b171ccc07a5df14 (diff) | |
| parent | be40936881a747893d03c5c003914efb3867ccd1 (diff) | |
Merge pull request #2610 from secondlife/frame-profile-json
Make Develop->Render Tests->Frame Profile dump JSON to a file too.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 764e52accb..093314a9f1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3285,10 +3285,10 @@ LLSD LLAppViewer::getViewerInfo() const LLVector3d pos = gAgent.getPositionGlobal(); info["POSITION"] = ll_sd_from_vector3d(pos); info["POSITION_LOCAL"] = ll_sd_from_vector3(gAgent.getPosAgentFromGlobal(pos)); - info["REGION"] = gAgent.getRegion()->getName(); + info["REGION"] = region->getName(); boost::regex regex("\\.(secondlife|lindenlab)\\..*"); - info["HOSTNAME"] = boost::regex_replace(gAgent.getRegion()->getSimHostName(), regex, ""); + info["HOSTNAME"] = boost::regex_replace(region->getSimHostName(), regex, ""); info["SERVER_VERSION"] = gLastVersionChannel; LLSLURL slurl; LLAgentUI::buildSLURL(slurl); |