From ea8fb7238e6f12383ee4bc081475fa6235637581 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 31 Mar 2007 01:41:19 +0000
Subject: svn merge -r 59364:59813
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/llui/llui.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llui/llui.cpp')

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index e8e3f271a0..f32266faa8 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1723,6 +1723,10 @@ LLString LLUI::locateSkin(const LLString& filename)
 		if (!gDirUtilp->fileExists(found_file))
 		{
 			LLString localization(sConfigGroup->getString("Language"));		
+			if(localization == "default")
+			{
+				localization = sConfigGroup->getString("SystemLanguage");
+			}
 			LLString local_skin = "xui" + slash + localization + slash + filename;
 			found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin);
 		}
-- 
cgit v1.2.3