From 31e7c77a411d94bc87f0232588b339149bb29a49 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 28 Sep 2008 17:21:23 -0500
Subject: Second Life viewer sources 1.21.3-RC

---
 linden/indra/newview/llfloaterjoystick.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llfloaterjoystick.cpp')

diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index e646eb5..172da1d 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -58,7 +58,7 @@ void LLFloaterJoystick::draw()
 	childSetEnabled("enable_joystick", joystick_inited);
 	childSetEnabled("joystick_type", joystick_inited);
 	std::string desc = LLViewerJoystick::getInstance()->getDescription();
-	if (desc.empty()) desc = getUIString("NoDevice");
+	if (desc.empty()) desc = getString("NoDevice");
 	childSetText("joystick_type", desc);
 
 	LLViewerJoystick* joystick(LLViewerJoystick::getInstance());
@@ -83,8 +83,8 @@ void LLFloaterJoystick::draw()
 BOOL LLFloaterJoystick::postBuild()
 {		
 	F32 range = gSavedSettings.getBOOL("Cursor3D") ? 1024.f : 2.f;
-	LLUIString axis = getUIString("Axis");
-	LLUIString joystick = getUIString("JoystickMonitor");
+	LLUIString axis = getString("Axis");
+	LLUIString joystick = getString("JoystickMonitor");
 
 	// use this child to get relative positioning info; we'll place the
 	// joystick monitor on its right, vertically aligned to it.
-- 
cgit v1.1