aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llviewercontrol.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewercontrol.cpp37
1 files changed, 20 insertions, 17 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 08abd2d..79ec70f 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -3,6 +3,8 @@
3 * @brief Viewer configuration 3 * @brief Viewer configuration
4 * @author Richard Nelson 4 * @author Richard Nelson
5 * 5 *
6 * $LicenseInfo:firstyear=2001&license=viewergpl$
7 *
6 * Copyright (c) 2001-2007, Linden Research, Inc. 8 * Copyright (c) 2001-2007, Linden Research, Inc.
7 * 9 *
8 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
25 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 27 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
26 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 28 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27 * COMPLETENESS OR PERFORMANCE. 29 * COMPLETENESS OR PERFORMANCE.
30 * $/LicenseInfo$
28 */ 31 */
29 32
30#include "llviewerprecompiledheaders.h" 33#include "llviewerprecompiledheaders.h"
@@ -255,7 +258,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
255 color_swatch->setVisible(FALSE); 258 color_swatch->setVisible(FALSE);
256 childSetVisible("val_text", FALSE); 259 childSetVisible("val_text", FALSE);
257 childSetVisible("boolean_combo", FALSE); 260 childSetVisible("boolean_combo", FALSE);
258 mComment->setText(""); 261 mComment->setText(LLString::null);
259 262
260 if (controlp) 263 if (controlp)
261 { 264 {
@@ -291,7 +294,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
291 { 294 {
292 case TYPE_U32: 295 case TYPE_U32:
293 spinner1->setVisible(TRUE); 296 spinner1->setVisible(TRUE);
294 spinner1->setLabel("value"); 297 spinner1->setLabel(LLString("value")); // Debug, don't translate
295 if (!spinner1->hasFocus()) 298 if (!spinner1->hasFocus())
296 { 299 {
297 spinner1->setValue(sd); 300 spinner1->setValue(sd);
@@ -303,7 +306,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
303 break; 306 break;
304 case TYPE_S32: 307 case TYPE_S32:
305 spinner1->setVisible(TRUE); 308 spinner1->setVisible(TRUE);
306 spinner1->setLabel("value"); 309 spinner1->setLabel(LLString("value")); // Debug, don't translate
307 if (!spinner1->hasFocus()) 310 if (!spinner1->hasFocus())
308 { 311 {
309 spinner1->setValue(sd); 312 spinner1->setValue(sd);
@@ -315,7 +318,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
315 break; 318 break;
316 case TYPE_F32: 319 case TYPE_F32:
317 spinner1->setVisible(TRUE); 320 spinner1->setVisible(TRUE);
318 spinner1->setLabel("value"); 321 spinner1->setLabel(LLString("value")); // Debug, don't translate
319 if (!spinner1->hasFocus()) 322 if (!spinner1->hasFocus())
320 { 323 {
321 spinner1->setPrecision(3); 324 spinner1->setPrecision(3);
@@ -349,11 +352,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
349 LLVector3 v; 352 LLVector3 v;
350 v.setValue(sd); 353 v.setValue(sd);
351 spinner1->setVisible(TRUE); 354 spinner1->setVisible(TRUE);
352 spinner1->setLabel("X"); 355 spinner1->setLabel(LLString("X"));
353 spinner2->setVisible(TRUE); 356 spinner2->setVisible(TRUE);
354 spinner2->setLabel("Y"); 357 spinner2->setLabel(LLString("Y"));
355 spinner3->setVisible(TRUE); 358 spinner3->setVisible(TRUE);
356 spinner3->setLabel("Z"); 359 spinner3->setLabel(LLString("Z"));
357 if (!spinner1->hasFocus()) 360 if (!spinner1->hasFocus())
358 { 361 {
359 spinner1->setPrecision(3); 362 spinner1->setPrecision(3);
@@ -376,11 +379,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
376 LLVector3d v; 379 LLVector3d v;
377 v.setValue(sd); 380 v.setValue(sd);
378 spinner1->setVisible(TRUE); 381 spinner1->setVisible(TRUE);
379 spinner1->setLabel("X"); 382 spinner1->setLabel(LLString("X"));
380 spinner2->setVisible(TRUE); 383 spinner2->setVisible(TRUE);
381 spinner2->setLabel("Y"); 384 spinner2->setLabel(LLString("Y"));
382 spinner3->setVisible(TRUE); 385 spinner3->setVisible(TRUE);
383 spinner3->setLabel("Z"); 386 spinner3->setLabel(LLString("Z"));
384 if (!spinner1->hasFocus()) 387 if (!spinner1->hasFocus())
385 { 388 {
386 spinner1->setPrecision(3); 389 spinner1->setPrecision(3);
@@ -403,13 +406,13 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
403 LLRect r; 406 LLRect r;
404 r.setValue(sd); 407 r.setValue(sd);
405 spinner1->setVisible(TRUE); 408 spinner1->setVisible(TRUE);
406 spinner1->setLabel("Left"); 409 spinner1->setLabel(LLString("Left"));
407 spinner2->setVisible(TRUE); 410 spinner2->setVisible(TRUE);
408 spinner2->setLabel("Right"); 411 spinner2->setLabel(LLString("Right"));
409 spinner3->setVisible(TRUE); 412 spinner3->setVisible(TRUE);
410 spinner3->setLabel("Bottom"); 413 spinner3->setLabel(LLString("Bottom"));
411 spinner4->setVisible(TRUE); 414 spinner4->setVisible(TRUE);
412 spinner4->setLabel("Top"); 415 spinner4->setLabel(LLString("Top"));
413 if (!spinner1->hasFocus()) 416 if (!spinner1->hasFocus())
414 { 417 {
415 spinner1->setPrecision(0); 418 spinner1->setPrecision(0);
@@ -459,7 +462,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
459 color_swatch->set(LLColor4(sd), TRUE, FALSE); 462 color_swatch->set(LLColor4(sd), TRUE, FALSE);
460 } 463 }
461 spinner4->setVisible(TRUE); 464 spinner4->setVisible(TRUE);
462 spinner4->setLabel("Alpha"); 465 spinner4->setLabel(LLString("Alpha"));
463 if (!spinner4->hasFocus()) 466 if (!spinner4->hasFocus())
464 { 467 {
465 spinner4->setPrecision(3); 468 spinner4->setPrecision(3);
@@ -487,7 +490,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
487 color_swatch->set(LLColor4(clr), TRUE, FALSE); 490 color_swatch->set(LLColor4(clr), TRUE, FALSE);
488 } 491 }
489 spinner4->setVisible(TRUE); 492 spinner4->setVisible(TRUE);
490 spinner4->setLabel("Alpha"); 493 spinner4->setLabel(LLString("Alpha"));
491 if(!spinner4->hasFocus()) 494 if(!spinner4->hasFocus())
492 { 495 {
493 spinner4->setPrecision(0); 496 spinner4->setPrecision(0);
@@ -501,7 +504,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
501 break; 504 break;
502 } 505 }
503 default: 506 default:
504 mComment->setText("unknown"); 507 mComment->setText(LLString("unknown"));
505 break; 508 break;
506 } 509 }
507 } 510 }
generated by cgit v1.1 at 2024-11-15 16:43:40 +0000