From b344612e4c99ea57b98e88d5569f50fed1dd8955 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 14 Nov 2012 16:00:02 -0500
Subject: DRTVWR-241: resolve merge conflict with viewer-development.
 LLUI::setupPaths() went away with DRTVWR-210.

---
 indra/newview/llappviewer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index fddf8bd7a3..438194c715 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2765,7 +2765,6 @@ bool LLAppViewer::initConfiguration()
 // keeps growing, necessitating a method all its own.
 void LLAppViewer::initStrings()
 {
-	LLUI::setupPaths();
 	LLTransUtil::parseStrings("strings.xml", default_trans_args);
 	LLTransUtil::parseLanguageStrings("language_settings.xml");
 
-- 
cgit v1.2.3