From ca178466c677487803eb4fc6ccbb86ebbdc17b33 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 1 Aug 2013 23:48:52 +0200 Subject: [PATCH] - Put app directories into Firestorm_x64 for 64 bit versions. - Append _x64 to APPNAME for 64 bit versions. --- indra/newview/llappviewer.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6a1f144b7c..3d7d776924 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -768,7 +768,13 @@ bool LLAppViewer::init() // Need to do this initialization before we do anything else, since anything // that touches files should really go through the lldir API + +#ifdef ND_BUILD64BIT_ARCH + gDirUtilp->initAppDirs("Firestorm_x64"); +#else gDirUtilp->initAppDirs("Firestorm"); +#endif + // set skin search path to default, will be overridden later // this allows simple skinned file lookups to work // [SL:KB] - Patch: Viewer-Skins | Checked: 2012-12-26 (Catznip-3.4) @@ -4519,7 +4525,11 @@ void LLAppViewer::purgeCache() std::string LLAppViewer::getSecondLifeTitle() const { +#ifdef ND_BUILD64BIT_ARCH + return LLTrans::getString("APP_NAME") + "_x64"; +#else return LLTrans::getString("APP_NAME"); +#endif } std::string LLAppViewer::getWindowTitle() const