diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
commit | df93749819c503a66bc0ad34aeb1c7bed3746df2 (patch) | |
tree | 9bc6ae94c08fd881b8a73bfc0bc4ea79169ebf9e /indra/newview/llappviewerlinux.cpp | |
parent | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (diff) | |
parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | indra/newview/llappviewerlinux.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 48d02dfeaa..e8d8efdc0a 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -365,7 +365,7 @@ void LLAppViewerLinux::handleCrashReporting(bool reportFreeze) const char * cmdargv[] = {cmd.c_str(), "-user", - (char*)LLGridManager::getInstance()->getGridLabel().c_str(), + (char*)LLGridManager::getInstance()->getGridId().c_str(), "-name", LLAppViewer::instance()->getSecondLifeTitle().c_str(), NULL}; |