summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 053b863b6d..62435c6288 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -195,6 +195,10 @@
#include "lldxhardware.h"
#endif
+#if (LL_LINUX || LL_SOLARIS) && LL_GTK
+#include <glib/gspawn.h>
+#endif
+
//
// exported globals
//
@@ -1824,9 +1828,9 @@ bool idle_startup()
{
gCacheName = new LLCacheName(gMessageSystem);
gCacheName->addObserver(&callback_cache_name);
- gCacheName->LocalizeCacheName("waiting", LLTrans::getString("CacheWaiting"));
- gCacheName->LocalizeCacheName("nobody", LLTrans::getString("CacheNobody"));
- gCacheName->LocalizeCacheName("none", LLTrans::getString("CacheNone"));
+ gCacheName->LocalizeCacheName("waiting", LLTrans::getString("AvatarNameWaiting"));
+ gCacheName->LocalizeCacheName("nobody", LLTrans::getString("AvatarNameNobody"));
+ gCacheName->LocalizeCacheName("none", LLTrans::getString("GroupNameNone"));
// Load stored cache if possible
LLAppViewer::instance()->loadNameCache();
}