diff options
Diffstat (limited to 'indra')
27 files changed, 110 insertions, 139 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 2cdd86267e..9be6275929 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3822,7 +3822,6 @@ <param id="30879" group="1" - sex="male" name="Male_Package" value_min="-.5" value_max="2"> @@ -5813,7 +5812,6 @@ <param id="400" - sex="male" group="1" name="Displace_Hair_Facial" label="Hair Thickess" @@ -6838,7 +6836,6 @@ <param id="626" - sex="female" group="1" name="Big_Chest" label="Chest Size" @@ -6865,7 +6862,6 @@ <param id="627" - sex="female" group="1" name="Small_Chest" label="Chest Size" @@ -6891,7 +6887,6 @@ <param id="843" - sex="female" group="1" name="No_Chest" label="Chest Size" @@ -6920,7 +6915,6 @@ group="1" name="Muscular_Torso" label="Torso Muscles" - sex="male" show_simple="true" wearable="shape" edit_group="shape_torso" @@ -6963,7 +6957,6 @@ group="1" name="Muscular_Torso" label="Torso Muscles" - sex="female" show_simple="true" wearable="shape" edit_group="shape_torso" @@ -7004,7 +6997,6 @@ <param id="648" group="1" - sex="female" name="Scrawny_Torso" label="Torso Muscles" show_simple="true" @@ -7059,7 +7051,6 @@ <param id="677" group="1" - sex="male" name="Scrawny_Torso_Male" label="Torso Scrawny" wearable="shape" @@ -7192,7 +7183,6 @@ <param id="507" group="0" - sex="female" name="Breast_Gravity" label="Breast Buoyancy" wearable="shape" @@ -7279,7 +7269,6 @@ <param id="684" group="0" - sex="female" name="Breast_Female_Cleavage" label="Breast Cleavage" wearable="shape" @@ -7307,7 +7296,6 @@ <param id="685" group="0" - sex="male" name="Chest_Male_No_Pecs" label="Pectorals" wearable="shape" @@ -7525,7 +7513,6 @@ <param id="1200" group="1" - sex="female" name="Breast_Physics_UpDown_Driven" wearable="physics" edit_group="driven" @@ -7547,7 +7534,6 @@ <param id="1201" group="1" - sex="female" name="Breast_Physics_InOut_Driven" wearable="physics" edit_group="driven" @@ -8079,7 +8065,6 @@ <param id="20879" group="1" - sex="male" name="Male_Package" value_min="-.5" value_max="2"> @@ -9837,7 +9822,6 @@ render_pass="bump"> <param id="1004" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9852,7 +9836,6 @@ render_pass="bump"> <param id="1006" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9867,7 +9850,6 @@ render_pass="bump"> <param id="1008" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9882,7 +9864,6 @@ render_pass="bump"> <param id="1010" - sex="male" group="1" edit_group="driven" wearable="hair" @@ -9898,7 +9879,6 @@ render_pass="bump"> <param id="1012" group="1" - sex="male" wearable="hair" edit_group="driven" name="5 O'Clock Shadow bump" @@ -9924,7 +9904,6 @@ render_pass="bump"> <param id="1005" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9939,7 +9918,6 @@ render_pass="bump"> <param id="1007" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9954,7 +9932,6 @@ render_pass="bump"> <param id="1009" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9969,7 +9946,6 @@ render_pass="bump"> <param id="1011" - sex="male" group="1" wearable="hair" edit_group="driven" @@ -9986,7 +9962,6 @@ render_pass="bump"> id="751" group="1" wearable="hair" - sex="male" edit_group="hair_facial" name="5 O'Clock Shadow" label_min="Dense hair" @@ -15097,7 +15072,6 @@ render_pass="bump"> <param id="105" group="0" - sex="female" wearable="shape" edit_group="shape_torso" edit_group_order="6" @@ -15262,7 +15236,6 @@ render_pass="bump"> <param id="649" group="0" - sex="female" wearable="shape" edit_group="shape_torso" edit_group_order="1.1" @@ -15297,7 +15270,6 @@ render_pass="bump"> <param id="678" group="0" - sex="male" wearable="shape" edit_group="shape_torso" edit_group_order="1" @@ -15365,10 +15337,14 @@ render_pass="bump"> id="80" name="male" group="0" - edit_group="dummy" + edit_group="shape_body" + label="Gender" + label_min="Female" + label_max="Male" wearable="shape" value_min="0" - value_max="1"> + value_max="1" + camera_distance="2.2"> <param_driver> <driven id="32" /> @@ -15583,7 +15559,6 @@ render_pass="bump"> <param id="752" group="0" - sex="male" wearable="hair" edit_group="hair_facial" edit_group_order="1" @@ -15865,7 +15840,6 @@ render_pass="bump"> <param id="879" group="0" - sex="male" name="Male_Package" label="Package" wearable="shape" @@ -16053,7 +16027,6 @@ render_pass="bump"> <param id="166" - sex="male" group="0" wearable="hair" edit_group="hair_facial" @@ -16079,7 +16052,6 @@ render_pass="bump"> <param id="167" - sex="male" group="0" wearable="hair" edit_group="hair_facial" @@ -16105,7 +16077,6 @@ render_pass="bump"> <param id="168" - sex="male" group="0" wearable="hair" edit_group="hair_facial" @@ -16131,7 +16102,6 @@ render_pass="bump"> <param id="169" - sex="male" group="0" wearable="hair" edit_group="hair_facial" @@ -16944,7 +16914,6 @@ render_pass="bump"> <param id="1100" group="1" - sex="female" wearable="physics" name="Breast_Physics_UpDown_Controller" label="Breast Physics UpDown Controller" @@ -16960,7 +16929,6 @@ render_pass="bump"> <param id="1101" group="1" - sex="female" wearable="physics" name="Breast_Physics_InOut_Controller" label="Breast Physics InOut Controller" @@ -17040,7 +17008,6 @@ render_pass="bump"> <param id="10000" group="0" - sex="female" name="Breast_Physics_Mass" label="Breast Physics Mass" wearable="physics" @@ -17053,7 +17020,6 @@ render_pass="bump"> <param id="10001" group="0" - sex="female" name="Breast_Physics_Gravity" label="Breast Physics Gravity" wearable="physics" @@ -17067,7 +17033,6 @@ render_pass="bump"> <param id="10002" group="0" - sex="female" name="Breast_Physics_Drag" label="Breast Physics Drag" wearable="physics" @@ -17081,7 +17046,6 @@ render_pass="bump"> <param id="10003" group="0" - sex="female" name="Breast_Physics_UpDown_Max_Effect" label="Breast Physics UpDown Max Effect" wearable="physics" @@ -17094,7 +17058,6 @@ render_pass="bump"> <param id="10004" group="0" - sex="female" name="Breast_Physics_UpDown_Spring" label="Breast Physics UpDown Spring" wearable="physics" @@ -17107,7 +17070,6 @@ render_pass="bump"> <param id="10005" group="0" - sex="female" name="Breast_Physics_UpDown_Gain" label="Breast Physics UpDown Gain" wearable="physics" @@ -17120,7 +17082,6 @@ render_pass="bump"> <param id="10006" group="0" - sex="female" name="Breast_Physics_UpDown_Damping" label="Breast Physics UpDown Damping" wearable="physics" @@ -17134,7 +17095,6 @@ render_pass="bump"> <param id="10007" group="0" - sex="female" name="Breast_Physics_InOut_Max_Effect" label="Breast Physics InOut Max Effect" wearable="physics" @@ -17147,7 +17107,6 @@ render_pass="bump"> <param id="10008" group="0" - sex="female" name="Breast_Physics_InOut_Spring" label="Breast Physics InOut Spring" wearable="physics" @@ -17160,7 +17119,6 @@ render_pass="bump"> <param id="10009" group="0" - sex="female" name="Breast_Physics_InOut_Gain" label="Breast Physics InOut Gain" wearable="physics" @@ -17173,7 +17131,6 @@ render_pass="bump"> <param id="10010" group="0" - sex="female" name="Breast_Physics_InOut_Damping" label="Breast Physics InOut Damping" wearable="physics" @@ -17407,7 +17364,6 @@ render_pass="bump"> <param id="10029" group="0" - sex="female" name="Breast_Physics_LeftRight_Max_Effect" label="Breast Physics LeftRight Max Effect" wearable="physics" @@ -17420,7 +17376,6 @@ render_pass="bump"> <param id="10030" group="0" - sex="female" name="Breast_Physics_LeftRight_Spring" label="Breast Physics LeftRight Spring" wearable="physics" @@ -17433,7 +17388,6 @@ render_pass="bump"> <param id="10031" group="0" - sex="female" name="Breast_Physics_LeftRight_Gain" label="Breast Physics LeftRight Gain" wearable="physics" @@ -17446,7 +17400,6 @@ render_pass="bump"> <param id="10032" group="0" - sex="female" name="Breast_Physics_LeftRight_Damping" label="Breast Physics LeftRight Damping" wearable="physics" diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 17e1a27934..68b07a46c4 100644 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -1385,8 +1385,6 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth) && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN && version > curr_cat->getVersion()) { - // Potentially should new_cat->setVersion(unknown) here, - // but might be waiting for a callback that would increment LL_DEBUGS("Inventory") << "Category " << category_id << " is stale. Known version: " << curr_cat->getVersion() << " server version: " << version << LL_ENDL; diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index 1578caa39c..6d80a18599 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -424,6 +424,7 @@ void LLFloaterEmojiPicker::fillGroups() LLButton::Params params; params.font = LLFontGL::getFontEmoji(); + params.name = "all_categories"; LLRect rect; rect.mTop = mGroups->getRect().getHeight(); diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 1f410bea10..c36b4b9726 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -30,6 +30,7 @@ #include "llaisapi.h" #include "llagent.h" #include "llappviewer.h" +#include "llappearancemgr.h" #include "llcallbacklist.h" #include "llinventorymodel.h" #include "llinventorypanel.h" @@ -423,6 +424,22 @@ void LLInventoryModelBackgroundFetch::fetchCOF(nullary_func_t callback) callback(); LLUUID cat_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT); LLInventoryModelBackgroundFetch::getInstance()->onAISFolderCalback(cat_id, id, FT_DEFAULT); + + if (id.notNull()) + { + // COF might have fetched base outfit folder through a link, but it hasn't + // fetched base outfit's content, which doesn't nessesary match COF, + // so make sure it's up to date + LLUUID baseoutfit_id = LLAppearanceMgr::getInstance()->getBaseOutfitUUID(); + if (baseoutfit_id.notNull()) + { + LLViewerInventoryCategory* cat = gInventory.getCategory(baseoutfit_id); + if (!cat || cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN) + { + LLInventoryModelBackgroundFetch::getInstance()->fetchFolderAndLinks(baseoutfit_id, no_op); + } + } + } }); // start idle loop to track completion diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index 5c7792b0df..ba714cbedd 100644 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -885,18 +885,10 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id) ++items_iter) { LLViewerInventoryCategory *cat = gInventory.getCategory(*items_iter); - if (!cat) + if (cat) { - LLInventoryObject* obj = gInventory.getObject(*items_iter); - if(!obj || (obj->getType() != LLAssetType::AT_CATEGORY)) - { - return; - } - cat = (LLViewerInventoryCategory*)obj; + updateChangedCategoryName(cat, cat->getName()); } - std::string name = cat->getName(); - - updateChangedCategoryName(cat, name); } sortOutfits(); diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp index e6e3a10e13..c7c0627009 100644 --- a/indra/newview/llpanelemojicomplete.cpp +++ b/indra/newview/llpanelemojicomplete.cpp @@ -68,6 +68,9 @@ LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p { LLScrollbar::Params sbparams; sbparams.orientation(LLScrollbar::VERTICAL); + sbparams.doc_size(mTotalEmojis); + sbparams.doc_pos(0); + sbparams.page_size(mVisibleEmojis); sbparams.change_callback([this](S32 index, LLScrollbar*) { onScrollbarChange(index); }); mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams); addChild(mScrollbar); diff --git a/indra/newview/llphysicsshapebuilderutil.cpp b/indra/newview/llphysicsshapebuilderutil.cpp index 9603ee6329..a79cc984c1 100644 --- a/indra/newview/llphysicsshapebuilderutil.cpp +++ b/indra/newview/llphysicsshapebuilderutil.cpp @@ -28,6 +28,26 @@ #include "llphysicsshapebuilderutil.h" +#include "llmeshrepository.h" + +bool LLPhysicsVolumeParams::hasDecomposition() const + { + if (!isMeshSculpt()) + { + return false; + } + + LLUUID mesh_id = getSculptID(); + if (mesh_id.isNull()) + { + return false; + } + + LLModel::Decomposition* decomp = gMeshRepo.getDecomposition(mesh_id); + + return decomp != NULL; +} + /* static */ void LLPhysicsShapeBuilderUtil::determinePhysicsShape( const LLPhysicsVolumeParams& volume_params, const LLVector3& scale, PhysicsShapeSpecification& specOut) { @@ -200,19 +220,32 @@ void LLPhysicsShapeBuilderUtil::determinePhysicsShape( const LLPhysicsVolumePara { specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX; } - else if (volume_params.isMeshSculpt() && - // Check overall dimensions, not individual triangles. - (scale.mV[0] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE || - scale.mV[1] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE || - scale.mV[2] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE - ) ) + else if (volume_params.isMeshSculpt()) { - // Server distinguishes between user-specified or default convex mesh, vs server's thin-triangle override, but we don't. - specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX; + // Check overall dimensions, not individual triangles. + if (scale.mV[0] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE + || scale.mV[1] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE + || scale.mV[2] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE + ) + { + if (volume_params.hasDecomposition()) + { + specOut.mType = PhysicsShapeSpecification::USER_MESH; + } + else + { + // Server distinguishes between user-specified or default convex mesh, vs server's thin-triangle override, but we don't. + specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX; + } + } + else + { + specOut.mType = PhysicsShapeSpecification::USER_MESH; + } } - else if ( volume_params.isSculpt() ) // Is a sculpt of any kind (mesh or legacy) + else if ( volume_params.isSculpt() ) { - specOut.mType = volume_params.isMeshSculpt() ? PhysicsShapeSpecification::USER_MESH : PhysicsShapeSpecification::SCULPT; + specOut.mType = PhysicsShapeSpecification::SCULPT; } else // Resort to mesh { diff --git a/indra/newview/llphysicsshapebuilderutil.h b/indra/newview/llphysicsshapebuilderutil.h index b3b100296f..24e68fcf77 100644 --- a/indra/newview/llphysicsshapebuilderutil.h +++ b/indra/newview/llphysicsshapebuilderutil.h @@ -78,6 +78,8 @@ public: bool shouldForceConvex() const { return mForceConvex; } + bool hasDecomposition() const; + private: bool mForceConvex; }; diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 02108e861a..59701cc5b3 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1723,7 +1723,13 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string user_data_path_cache = gDirUtilp->getCacheDir(false); user_data_path_cache += gDirUtilp->getDirDelimiter(); - std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt"); + std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.txt"); + std::string user_data_path_cef_old = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.old"); + if (gDirUtilp->fileExists(user_data_path_cef_log)) + { + LLFile::remove(user_data_path_cef_old, ENOENT); + LLFile::rename(user_data_path_cef_log, user_data_path_cef_old); + } // See if the plugin executable exists llstat s; diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 3725510b6a..bda8c35702 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -989,6 +989,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() std::string old_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SLVoice.old"); if (gDirUtilp->fileExists(new_log)) { + LLFile::remove(old_log, ENOENT); LLFile::rename(new_log, old_log); } diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index e4f99d14e9..2e351cbc65 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -2688,6 +2688,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Full Sides"> Meget hår </string> + <string name="Gender"> + Køn + </string> <string name="Glossy"> Skinnende </string> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index a9e7626dc5..4a4a34911d 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -1248,6 +1248,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="Full Front">Vorne volles Haar</string> <string name="Full Hair Sides">Seitlich volles Haar</string> <string name="Full Sides">Volle Seiten</string> + <string name="Gender">Geschlecht</string> <string name="Glossy">Glänzend</string> <string name="Glove Fingers">Handschuhfinger</string> <string name="Glove Length">Handschuhlänge</string> diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml index 645003cc14..f4e61a828e 100644 --- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml @@ -74,6 +74,8 @@ orientation="vertical" step_size="16" doc_size="3000" + page_size="50" + doc_pos="0" /> </layout_panel> <layout_panel name="timers_panel" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index c965a4427c..fbba1290c0 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -34,7 +34,8 @@ top="16" left="0" right="-1" - bottom="-1"> + bottom="-1" + orientation="horizontal"> <layout_panel name="map_lp" width="385" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 7b3b4ed395..49bb9917ab 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -3975,16 +3975,6 @@ function="World.EnvPreset" <menu_item_separator/> - <menu_item_check - label="HTTP Textures" - name="HTTP Textures"> - <menu_item_check.on_check - function="CheckControl" - parameter="ImagePipelineUseHTTP" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="ImagePipelineUseHTTP" /> - </menu_item_check> <menu_item_call label="Compress Images" name="Compress Images"> diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 85d73ece48..b3aadb8ea1 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -202,57 +202,6 @@ top="10" value="Shape:" width="150" /> - <radio_group - control_name="AvatarSex" - follows="top|right" - height="20" - layout="topleft" - left="210" - name="sex_radio" - top="5" - width="110"> - <radio_item - follows="all" - height="16" - label="" - layout="topleft" - left="0" - name="sex_male" - tool_tip="Male" - value="1" - width="40" /> - <radio_item - follows="all" - height="16" - label="" - layout="topleft" - left_pad="10" - name="sex_female" - tool_tip="Female" - value="0" - width="40"/> - </radio_group> - <!-- graphical labels for the radio buttons above --> - <icon - follows="top|right" - height="16" - image_name="icons/Male.png" - layout="topleft" - left="230" - name="male_icon" - tool_tip="Male" - top="7" - width="16" /> - <icon - follows="top|right" - height="16" - image_name="icons/Female.png" - layout="topleft" - left="280" - name="female_icon" - tool_tip="Female" - top="7" - width="16" /> <line_editor follows="all" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 3aba80909a..86b08bb24a 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -144,7 +144,6 @@ control_name="RememberPassword" follows="left|top" font="SansSerifMedium" - text_color="EmphasisColor" height="24" left="408" bottom_delta="0" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7360c06f86..87f866881d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3242,6 +3242,7 @@ Please reinstall viewer from https://secondlife.com/support/downloads/ and cont <string name="Full Front">Full Front</string> <string name="Full Hair Sides">Full Hair Sides</string> <string name="Full Sides">Full Sides</string> +<string name="Gender">Gender</string> <string name="Glossy">Glossy</string> <string name="Glove Fingers">Glove Fingers</string> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index cd8e7687ae..fd85cdc252 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1227,6 +1227,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].</string> <string name="Full Front">Sin cortar</string> <string name="Full Hair Sides">Pelo: volumen a los lados</string> <string name="Full Sides">Volumen total</string> + <string name="Gender">Sexo</string> <string name="Glossy">Con brillo</string> <string name="Glove Fingers">Guantes: dedos</string> <string name="Glove Length">Guantes: largo</string> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 0a3fbeb603..5969856086 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1249,6 +1249,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].</string> <string name="Full Front">Devant touffu</string> <string name="Full Hair Sides">Côtés touffus</string> <string name="Full Sides">Côtés touffus</string> + <string name="Gender">Sexe</string> <string name="Glossy">Brillant</string> <string name="Glove Fingers">Gants avec doigts</string> <string name="Glove Length">Longueur</string> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 178bb90ca6..e12203c6b7 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -1229,6 +1229,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].</string> <string name="Full Front">Anteriore gonfio</string> <string name="Full Hair Sides">Lati capelli gonfi</string> <string name="Full Sides">Lati gonfi</string> + <string name="Gender">Sesso</string> <string name="Glossy">Lucido</string> <string name="Glove Fingers">Dita con guanti</string> <string name="Glove Length">Lunghezza guanti</string> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index fa6c329fe7..8fe69162c5 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -5052,6 +5052,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Full Sides"> 生え揃ったサイド </string> + <string name="Gender"> + 性別 + </string> <string name="Glossy"> あり </string> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 26ec6cc9dc..a2d386e8ac 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -3318,6 +3318,9 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. <string name="Full Sides"> Gęste boki </string> + <string name="Gender"> + Płeć + </string> <string name="Glossy"> Błyszcząca </string> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 6db5da2e89..5076e21198 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -1192,6 +1192,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].</string> <string name="Full Front">Frente cheia</string> <string name="Full Hair Sides">Cabelos laterais cheios</string> <string name="Full Sides">Lados cheios</string> + <string name="Gender">Sexo</string> <string name="Glossy">Brilhante</string> <string name="Glove Fingers">Dedos da luva</string> <string name="Glove Length">Comprimento das luvas</string> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 61d836a2d1..8fc9641624 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -3479,6 +3479,9 @@ support@secondlife.com. <string name="Full Sides"> По бокам </string> + <string name="Gender"> + Пол + </string> <string name="Glossy"> Блестящие </string> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index e709a4c5d6..687de84401 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -3482,6 +3482,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. <string name="Full Sides"> Saçlar Yanda </string> + <string name="Gender"> + Cinsiyet + </string> <string name="Glossy"> Parlak </string> diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index bdb16c9bf1..cf94391aa4 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -3475,6 +3475,9 @@ http://secondlife.com/support 求助解決問題。 <string name="Full Sides"> 兩側飽滿 </string> + <string name="Gender"> + 性别 + </string> <string name="Glossy"> 光亮 </string> |