diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-16 21:02:48 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-16 21:02:48 -0400 |
commit | c370313676451f6e5cfd72bec314ad79bc653833 (patch) | |
tree | 1bd99330b482d828f8edc71691d177078123fd1e /indra/newview/llappviewerlinux.cpp | |
parent | 988767d5ec4631ad9f0099180a92c4f186553940 (diff) | |
parent | f2e2ea99a351ca8663af460974137545d020b97f (diff) |
Automated merge with file:///Users/nat/linden/viewer-sourceid
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}; |