diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
commit | 20379fecd9aea4d3450bcda815ad63f0ce9c729f (patch) | |
tree | 21ef1bddf49efc133b9ec74e572345125fb62175 /indra/newview/llappviewerlinux.cpp | |
parent | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (diff) | |
parent | 8bd5a3bca38b0ba663d3563029e54da057020424 (diff) |
automated merge
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 d34bcb4a68..78b0f7ba83 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -604,7 +604,7 @@ void LLAppViewerLinux::handleCrashReporting(bool reportFreeze) {cmd.c_str(), ask_dialog, "-user", - (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(), + (char*)LLGridManager::getInstance()->getGridLabel().c_str(), "-name", LLAppViewer::instance()->getSecondLifeTitle().c_str(), NULL}; |