aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatercustomize.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatercustomize.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index 3c5c9a5..5351aa5 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -2,6 +2,8 @@
2 * @file llfloatercustomize.cpp 2 * @file llfloatercustomize.cpp
3 * @brief The customize avatar floater, triggered by "Appearance..." 3 * @brief The customize avatar floater, triggered by "Appearance..."
4 * 4 *
5 * $LicenseInfo:firstyear=2002&license=viewergpl$
6 *
5 * Copyright (c) 2002-2007, Linden Research, Inc. 7 * Copyright (c) 2002-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#include "llviewerprecompiledheaders.h" 32#include "llviewerprecompiledheaders.h"
@@ -74,7 +77,7 @@
74 77
75#include "llfilepicker.h" 78#include "llfilepicker.h"
76 79
77//XUI:translate : The ui xml for this really needs to be integrated with the appearance paramaters 80//*TODO:translate : The ui xml for this really needs to be integrated with the appearance paramaters
78 81
79// Globals 82// Globals
80LLFloaterCustomize* gFloaterCustomize = NULL; 83LLFloaterCustomize* gFloaterCustomize = NULL;
@@ -866,8 +869,9 @@ void LLPanelEditWearable::draw()
866 869
867 if(has_wearable && !is_modifiable) 870 if(has_wearable && !is_modifiable)
868 { 871 {
872 // *TODO:Translate
869 childSetVisible("title_no_modify", TRUE); 873 childSetVisible("title_no_modify", TRUE);
870 childSetTextArg("title_no_modify", "[DESC]", LLWearable::typeToTypeLabel( mType )); 874 childSetTextArg("title_no_modify", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
871 875
872 for( std::map<LLString, S32>::iterator iter = mTextureList.begin(); 876 for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
873 iter != mTextureList.end(); ++iter ) 877 iter != mTextureList.end(); ++iter )
@@ -882,8 +886,9 @@ void LLPanelEditWearable::draw()
882 } 886 }
883 else if(has_wearable && !is_complete) 887 else if(has_wearable && !is_complete)
884 { 888 {
889 // *TODO:Translate
885 childSetVisible("title_loading", TRUE); 890 childSetVisible("title_loading", TRUE);
886 childSetTextArg("title_loading", "[DESC]", LLWearable::typeToTypeLabel( mType )); 891 childSetTextArg("title_loading", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
887 892
888 LLString path; 893 LLString path;
889 const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() ); 894 const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
@@ -950,8 +955,9 @@ void LLPanelEditWearable::draw()
950 } 955 }
951 else 956 else
952 { 957 {
958 // *TODO:Translate
953 childSetVisible("title_not_worn", TRUE); 959 childSetVisible("title_not_worn", TRUE);
954 childSetTextArg("title_not_worn", "[DESC]", LLWearable::typeToTypeLabel( mType )); 960 childSetTextArg("title_not_worn", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
955 961
956 for( std::map<LLString, S32>::iterator iter = mTextureList.begin(); 962 for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
957 iter != mTextureList.end(); ++iter ) 963 iter != mTextureList.end(); ++iter )
@@ -1184,7 +1190,7 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLString& name,
1184 childSetEnabled("param slider", mAllowModify); 1190 childSetEnabled("param slider", mAllowModify);
1185 childSetCommitCallback("param slider", LLScrollingPanelParam::onSliderMoved, this); 1191 childSetCommitCallback("param slider", LLScrollingPanelParam::onSliderMoved, this);
1186 1192
1187 // XUI:translate 1193 // *TODO::translate
1188 LLString min_name = param->getMinDisplayName(); 1194 LLString min_name = param->getMinDisplayName();
1189 LLString max_name = param->getMaxDisplayName(); 1195 LLString max_name = param->getMaxDisplayName();
1190 childSetValue("min param text", min_name); 1196 childSetValue("min param text", min_name);