livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

master
Ansariel 2024-04-24 16:24:55 +02:00
parent 5bd0de2a92 72c4683dab
commit f8acb81bf7
99 changed files with 11140 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -152,6 +152,7 @@ set(viewer_SOURCE_FILES
fsnearbychatvoicemonitor.cpp
fspanelblocklist.cpp
fspanelcontactsets.cpp
fspanelface.cpp
fspanelimcontrolpanel.cpp
fspanellogin.cpp
fspanelprefs.cpp
@ -944,6 +945,7 @@ set(viewer_HEADER_FILES
fsnearbychatvoicemonitor.h
fspanelblocklist.h
fspanelcontactsets.h
fspanelface.h
fspanelimcontrolpanel.h
fspanellogin.h
fspanelprefs.h

26
indra/newview/app_settings/graphic_preset_controls.xml
View File

@ -19,29 +19,55 @@
<string>RenderAvatarMaxComplexity</string>
<string>RenderAvatarMaxNonImpostors</string>
<string>RenderAvatarPhysicsLODFactor</string>
<string>RenderCloudShadowAmbianceFactor</string>
<string>RenderCompressTextures</string>
<string>RenderDeferredSSAO</string>
<string>RenderDepthOfField</string>
<string>RenderDepthOfFieldInEditMode</string>
<string>RenderDisablePostProcessing</string>
<string>RenderPostProcessingHDR</string>
<string>RenderDefaultProbeUpdatePeriod</string>
<string>RenderDynamicExposureCoefficient</string>
<string>RenderExposure</string>
<string>RenderFarClip</string>
<string>RenderFlexTimeFactor</string>
<string>RenderFSAASamples</string>
<string>RenderGlow</string>
<string>RenderGlowHDR</string>
<string>RenderGlowIterations</string>
<string>RenderGlowNoise</string>
<string>RenderGlowResolutionPow</string>
<string>RenderLocalLightCount</string>
<string>RenderMaxPartCount</string>
<string>RenderMaxVRAMBudget</string>
<string>RenderQualityPerformance</string>
<string>RenderReflectionsEnabled</string>
<string>RenderReflectionProbeAmbiance</string>
<string>RenderReflectionProbeDetail</string>
<string>RenderReflectionProbeDrawDistance</string>
<string>RenderReflectionProbeLevel</string>
<string>RenderReflectionProbeMaxLocalLightAmbiance</string>
<string>RenderReflectionProbeResolution</string>
<string>RenderReflectionProbeVolumes</string>
<string>RenderScreenSpaceReflections</string>
<string>RenderScreenSpaceReflectionIterations</string>
<string>RenderScreenSpaceReflectionRayStep</string>
<string>RenderScreenSpaceReflectionDistanceBias</string>
<string>RenderScreenSpaceReflectionDepthRejectBias</string>
<string>RenderScreenSpaceReflectionAdaptiveStepMultiplier</string>
<string>RenderScreenSpaceReflectionGlossySamples</string>
<string>RenderShaderLightingMaxLevel</string>
<string>RenderShadowDetail</string>
<string>RenderShadowResolutionScale</string>
<string>RenderSkyAmbientScale</string>
<string>RenderSkyAutoAdjustAmbientScale</string>
<string>RenderSkyAutoAdjustBlueDensityScale</string>
<string>RenderSkyAutoAdjustBlueHorizonScale</string>
<string>RenderSkyAutoAdjustSunColorScale</string>
<string>RenderSkyAutoAdjustHDRScale</string>
<string>RenderSkyAutoAdjustLegacy</string>
<string>RenderSkyAutoAdjustProbeAmbiance</string>
<string>RenderSkySunlightScale</string>
<string>RenderSSAOIrradianceScale</string>
<string>RenderSSAOIrradianceMax</string>
<string>RenderSunDynamicRange</string>

73
indra/newview/app_settings/settings.xml
View File

@ -13580,7 +13580,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>1.0</real>
</map>
<key>RendeSkyAutoAdjustBlueHorizonScale</key>
<key>RenderSkyAutoAdjustBlueHorizonScale</key>
<map>
<key>Comment</key>
<string>Blue Horizon Scale value to use when auto-adjusting legacy skies</string>
@ -13591,7 +13591,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>1.0</real>
</map>
<key>RendeSkyAutoAdjustBlueDensityScale</key>
<key>RenderSkyAutoAdjustBlueDensityScale</key>
<map>
<key>Comment</key>
<string>Blue Horizon Scale value to use when auto-adjusting legacy skies</string>
@ -17952,6 +17952,21 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Backup</key>
<integer>0</integer>
</map>
<key>FSShowSelectedInBlinnPhong</key>
<map>
<key>Comment</key>
<string>Show BlinnPhong while selected (non-persistent).This setting is driven by the code, not by user</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>Backup</key>
<integer>0</integer>
<key>HideFromEditor</key>
<integer>1</integer>
</map>
<key>ShowSpecificLODInEdit</key>
<map>
<key>Comment</key>
@ -26550,5 +26565,57 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>128578</integer>
</map>
</map>
<key>FSUseNewTexturePanel</key>
<map>
<key>Backup</key>
<boolean>1</boolean>
<key>Comment</key>
<string>Use the new Texture/Material editor panel in build mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>1</boolean>
</map>
<key>FSInternalCanEditObjectFaces</key>
<map>
<key>Comment</key>
<string>Internal control to show/hide object texture/material edit controls</string>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSInternalFaceHasBPNormalMap</key>
<map>
<key>Comment</key>
<string>Internal control to store a flag about the edited face having a Blinn-Phong normal map or not</string>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSInternalFaceHasBPSpecularMap</key>
<map>
<key>Comment</key>
<string>Internal control to store a flag about the edited face having a Blinn-Phong specular map or not</string>
<key>HideFromEditor</key>
<integer>1</integer>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

5982
indra/newview/fspanelface.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

806
indra/newview/fspanelface.h Normal file
View File

@ -0,0 +1,806 @@
/**
* @file fspanelface.h
* @brief Consolidated materials/texture panel in the tools floater
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
* Copyright (C) 2024, Zi Ree@Second Life
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef FS_FSPANELFACE_H
#define FS_FSPANELFACE_H
#include "v4color.h"
#include "llpanel.h"
#include "llgltfmaterial.h"
#include "llmaterial.h"
#include "llmaterialmgr.h"
#include "lltextureentry.h"
#include "llselectmgr.h"
#include <memory>
class LLButton;
class LLCheckBoxCtrl;
class LLColorSwatchCtrl;
class LLComboBox;
class LLInventoryItem;
class LLLineEditor;
class LLRadioGroup;
class LLSpinCtrl;
class LLTextBox;
class LLTextureCtrl;
class LLUICtrl;
class LLViewerObject;
class LLFloater;
class LLMaterialID;
class LLMediaCtrl;
class LLMenuButton;
class PBRPickerAgentListener;
class PBRPickerObjectListener;
class LLTabContainer;
// Represents an edit for use in replicating the op across one or more materials in the selection set.
//
// The apply function optionally performs the edit which it implements
// as a functor taking Data that calls member func MaterialFunc taking SetValueType
// on an instance of the LLMaterial class.
//
// boost who?
//
template<
typename DataType,
typename SetValueType,
void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
class FSMaterialEditFunctor
{
public:
FSMaterialEditFunctor(const DataType& data) : _data(data) {}
virtual ~FSMaterialEditFunctor() {}
virtual void apply(LLMaterialPtr& material) { (material->*(MaterialEditFunc))(_data); }
DataType _data;
};
template<
typename DataType,
DataType (LLMaterial::*MaterialGetFunc)() >
class FSMaterialGetFunctor
{
public:
FSMaterialGetFunctor() {}
virtual DataType get(LLMaterialPtr& material) { return (material->*(MaterialGetFunc)); }
};
template<
typename DataType,
DataType (LLTextureEntry::*TEGetFunc)() >
class FSTEGetFunctor
{
public:
FSTEGetFunctor() {}
virtual DataType get(LLTextureEntry* entry) { return (entry*(TEGetFunc)); }
};
//
// main class
//
class FSPanelFace : public LLPanel
{
public:
FSPanelFace();
virtual ~FSPanelFace();
virtual BOOL postBuild();
void refresh();
void refreshMedia();
void unloadMedia();
void changePrecision(S32 decimal_precision); // <FS:CR> Adjustable decimal precision
static void onMaterialOverrideReceived(const LLUUID& object_id, S32 side);
/*virtual*/ void onVisibilityChange(BOOL new_visibility);
/*virtual*/ void draw();
LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material);
LLRender::eTexIndex getTextureChannelToEdit();
LLRender::eTexIndex getTextureDropChannel();
LLGLTFMaterial::TextureInfo getPBRDropChannel();
protected:
void navigateToTitleMedia(const std::string url);
bool selectedMediaEditable();
void clearMediaSettings();
void updateMediaSettings();
void updateMediaTitle();
void getState();
void sendTexture(); // applies and sends texture
void sendTextureInfo(); // applies and sends texture scale, offset, etc.
void sendColor(); // applies and sends color
void sendAlpha(); // applies and sends transparency
void sendBump(U32 bumpiness); // applies and sends bump map
void sendTexGen(); // applies and sends bump map
void sendShiny(U32 shininess); // applies and sends shininess
void sendFullbright(); // applies and sends full bright
void sendGlow();
void alignTextureLayer();
void updateCopyTexButton();
//
// UI Callbacks
//
// common controls and parameters for Blinn-Phong and PBR
void onCopyFaces(); // <FS> Extended copy & paste buttons
void onPasteFaces();
void onCommitGlow();
void onCommitRepeatsPerMeter();
// Blinn-Phong alpha parameters
void onCommitAlpha();
void onCommitAlphaMode();
void onCommitMaterialMaskCutoff();
void onCommitFullbright();
// Blinn-Phong texture transforms and controls
void onCommitTexGen();
void onCommitPlanarAlign();
void onCommitBump();
void onCommitShiny();
void onCommitTextureScaleX();
void onCommitTextureScaleY();
void onCommitTextureOffsetX();
void onCommitTextureOffsetY();
void onCommitTextureRot();
void onCommitMaterialBumpyScaleX();
void onCommitMaterialBumpyScaleY();
void onCommitMaterialBumpyOffsetX();
void onCommitMaterialBumpyOffsetY();
void onCommitMaterialBumpyRot();
void onCommitMaterialShinyScaleX();
void onCommitMaterialShinyScaleY();
void onCommitMaterialShinyOffsetX();
void onCommitMaterialShinyOffsetY();
void onCommitMaterialShinyRot();
void onCommitMaterialGloss();
void onCommitMaterialEnv();
// Blinn-Phong Diffuse tint color swatch
void onCommitColor();
void onCancelColor();
void onSelectColor();
// Blinn-Phong Diffuse texture swatch
void onCommitTexture(const LLUICtrl* ctrl, const LLSD& data);
void onCancelTexture();
BOOL onDragTexture(LLInventoryItem* item); // this function is to return TRUE if the drag should succeed.
void onCloseTexturePicker(const LLSD& data);
// Blinn-Phong Normal texture swatch
void onCommitNormalTexture(const LLUICtrl* ctrl, const LLSD& data);
void onCancelNormalTexture();
// Blinn-Phong Specular texture swatch
void onCommitSpecularTexture(const LLUICtrl* ctrl, const LLSD& data);
void onCancelSpecularTexture();
// Blinn-Phong Specular tint color swatch
void onCommitShinyColor();
void onCancelShinyColor();
void onSelectShinyColor();
// Texture alignment and maps synchronization
void onClickAutoFix();
void onAlignTexture();
void onClickMapsSync();
/*
* Checks whether the selected texture from the LLFloaterTexturePicker can be applied to the currently selected object.
* If agent selects texture which is not allowed to be applied for the currently selected object,
* all controls of the floater texture picker which allow to apply the texture will be disabled.
*/
void onTextureSelectionChanged(const std::string& which_control);
// Media
void onClickBtnEditMedia();
void onClickBtnDeleteMedia();
void onClickBtnAddMedia();
void alignMaterialsProperties();
//
// PBR
//
// PBR Material
void onCommitPbr();
void onCancelPbr();
void onSelectPbr();
BOOL onDragPbr(LLInventoryItem* item); // this function is to return TRUE if the drag should succeed.
void onPbrSelectionChanged(LLInventoryItem* itemp);
void onClickBtnSavePBR();
void updatePBROverrideDisplay();
// PBR texture maps
void onCommitPbr(const LLUICtrl* pbr_ctrl);
void onCancelPbr(const LLUICtrl* pbr_ctrl);
void onSelectPbr(const LLUICtrl* pbr_ctrl);
void getGLTFMaterial(LLGLTFMaterial* mat);
//
// other
//
bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
// Make UI reflect state of currently selected material (refresh)
// and UI mode (e.g. editing normal map v diffuse map)
//
// @param force_set_values forces spinners to set value even if they are focused
void updateUI(bool force_set_values = false);
// Convenience func to determine if all faces in selection have
// identical planar texgen settings during edits
//
bool isIdenticalPlanarTexgen();
// Callback funcs for individual controls
//
static void syncRepeatX(FSPanelFace* self, F32 scaleU);
static void syncRepeatY(FSPanelFace* self, F32 scaleV);
static void syncOffsetX(FSPanelFace* self, F32 offsetU);
static void syncOffsetY(FSPanelFace* self, F32 offsetV);
static void syncMaterialRot(FSPanelFace* self, F32 rot, int te = -1);
// unify all GLTF spinners with no switching around required -Zi
void onCommitGLTFUVSpinner(const LLUICtrl* ctrl, const LLSD& user_data);
void onClickBtnSelectSameTexture(const LLUICtrl* ctrl, const LLSD& user_data); // Find all faces with same texture
void onShowFindAllButton(LLUICtrl* ctrl, const LLSD& user_data); // Find all faces with same texture
void onHideFindAllButton(LLUICtrl* ctrl, const LLSD& user_data); // Find all faces with same texture
public: // needs to be accessible to selection manager
void onCopyColor(); // records all selected faces
void onPasteColor(); // to specific face
void onPasteColor(LLViewerObject* objectp, S32 te); // to specific face
void onCopyTexture();
void onPasteTexture();
void onPasteTexture(LLViewerObject* objectp, S32 te);
protected:
//
// Constant definitions for tabs and combo boxes
// Must match the commbobox definitions in panel_tools_texture.xml // Not anymore -Zi
//
static constexpr S32 MATMEDIA_MATERIAL = 0; // Material
static constexpr S32 MATMEDIA_PBR = 1; // PBR
static constexpr S32 MATMEDIA_MEDIA = 2; // Media
static constexpr S32 MATTYPE_DIFFUSE = 0; // Diffuse material texture
static constexpr S32 MATTYPE_NORMAL = 1; // Normal map
static constexpr S32 MATTYPE_SPECULAR = 2; // Specular map
static constexpr S32 BUMPY_TEXTURE = 18; // use supplied normal map (index of "Use Texture" in combo box)
static constexpr S32 SHINY_TEXTURE = 4; // use supplied specular map (index of "Use Texture" in combo box)
static constexpr S32 PBRTYPE_RENDER_MATERIAL_ID = 0; // Render Material ID
static constexpr S32 PBRTYPE_BASE_COLOR = 1; // PBR Base Color
static constexpr S32 PBRTYPE_METALLIC_ROUGHNESS = 2; // PBR Metallic
static constexpr S32 PBRTYPE_EMISSIVE = 3; // PBR Emissive
static constexpr S32 PBRTYPE_NORMAL = 4; // PBR Normal
static constexpr S32 PBRTYPE_COUNT = 5; // number of PBR map types
public:
// public because ... functors? -Zi
void onCommitFlip(const LLSD& user_data);
// Blinn-Phong texture transforms and controls
// public because ... functors? -Zi
LLSpinCtrl* mCtrlTexScaleU;
LLSpinCtrl* mCtrlTexScaleV;
LLSpinCtrl* mCtrlBumpyScaleU;
LLSpinCtrl* mCtrlBumpyScaleV;
LLSpinCtrl* mCtrlShinyScaleU;
LLSpinCtrl* mCtrlShinyScaleV;
LLSpinCtrl* mCtrlTexOffsetU;
LLSpinCtrl* mCtrlTexOffsetV;
LLSpinCtrl* mCtrlBumpyOffsetU;
LLSpinCtrl* mCtrlBumpyOffsetV;
LLSpinCtrl* mCtrlShinyOffsetU;
LLSpinCtrl* mCtrlShinyOffsetV;
LLSpinCtrl* mCtrlTexRot;
LLSpinCtrl* mCtrlBumpyRot;
LLSpinCtrl* mCtrlShinyRot;
// Blinn-Phong texture transforms and controls
// public to give functors access -Zi
LLComboBox* mComboTexGen;
LLCheckBoxCtrl* mCheckPlanarAlign;
// Tab controls
// public to give functors access -Zi
LLTabContainer* mTabsMatChannel;
void onMatTabChange();
private:
bool isAlpha() { return mIsAlpha; }
// Update visibility of controls to match current UI mode
// (e.g. materials vs media editing)
//
// Do NOT call updateUI from within this function.
//
void updateVisibility(LLViewerObject* objectp = nullptr);
// Convenience funcs to keep the visual flack to a minimum
//
LLUUID getCurrentNormalMap();
LLUUID getCurrentSpecularMap();
U32 getCurrentShininess();
U32 getCurrentBumpiness();
U8 getCurrentDiffuseAlphaMode();
U8 getCurrentAlphaMaskCutoff();
U8 getCurrentEnvIntensity();
U8 getCurrentGlossiness();
F32 getCurrentBumpyRot();
F32 getCurrentBumpyScaleU();
F32 getCurrentBumpyScaleV();
F32 getCurrentBumpyOffsetU();
F32 getCurrentBumpyOffsetV();
F32 getCurrentShinyRot();
F32 getCurrentShinyScaleU();
F32 getCurrentShinyScaleV();
F32 getCurrentShinyOffsetU();
F32 getCurrentShinyOffsetV();
// <FS:Zi> map tab states to various values
// TODO: should be done with tab-change signals and flags, really
S32 getCurrentMaterialType() const;
S32 getCurrentMatChannel() const;
S32 getCurrentPBRChannel() const;
void selectMaterialType(S32 material_type);
void selectMatChannel(S32 mat_channel);
void selectPBRChannel(S32 pbr_channel);
F32 getCurrentTextureRot();
F32 getCurrentTextureScaleU();
F32 getCurrentTextureScaleV();
F32 getCurrentTextureOffsetU();
F32 getCurrentTextureOffsetV();
//
// Build tool controls
//
// private Tab controls
LLTabContainer* mTabsPBRMatMedia;
LLTabContainer* mTabsPBRChannel;
// common controls and parameters for Blinn-Phong and PBR
LLButton* mBtnCopyFaces;
LLButton* mBtnPasteFaces;
LLSpinCtrl* mCtrlGlow;
LLSpinCtrl* mCtrlRpt;
// Blinn-Phong alpha parameters
LLSpinCtrl* mCtrlColorTransp; // transparency = 1 - alpha
LLView* mColorTransPercent;
LLTextBox* mLabelAlphaMode;
LLComboBox* mComboAlphaMode;
LLSpinCtrl* mCtrlMaskCutoff;
LLCheckBoxCtrl* mCheckFullbright;
// private Blinn-Phong texture transforms and controls
LLView* mLabelTexGen;
LLView* mLabelBumpiness;
LLComboBox* mComboBumpiness;
LLView* mLabelShininess;
LLComboBox* mComboShininess;
// others are above in the public section
LLSpinCtrl* mCtrlGlossiness;
LLSpinCtrl* mCtrlEnvironment;
// Blinn-Phong Diffuse tint color swatch
LLColorSwatchCtrl* mColorSwatch;
// Blinn-Phong Diffuse texture swatch
LLTextureCtrl* mTextureCtrl;
// Blinn-Phong Normal texture swatch
LLTextureCtrl* mBumpyTextureCtrl;
// Blinn-Phong Specular texture swatch
LLTextureCtrl* mShinyTextureCtrl;
// Blinn-Phong Specular tint color swatch
LLColorSwatchCtrl* mShinyColorSwatch;
// Texture alignment and maps synchronization
LLButton* mBtnAlignMedia;
LLButton* mBtnAlignTextures;
LLCheckBoxCtrl* mCheckSyncMaterials;
// Media
LLButton* mBtnDeleteMedia;
LLButton* mBtnAddMedia;
LLMediaCtrl* mTitleMedia;
LLTextBox* mTitleMediaText;
// PBR
LLTextureCtrl* mMaterialCtrlPBR;
LLColorSwatchCtrl* mBaseTintPBR;
LLTextureCtrl* mBaseTexturePBR;
LLTextureCtrl* mNormalTexturePBR;
LLTextureCtrl* mORMTexturePBR;
LLTextureCtrl* mEmissiveTexturePBR;
LLColorSwatchCtrl* mEmissiveTintPBR;
LLCheckBoxCtrl* mCheckDoubleSidedPBR;
LLSpinCtrl* mAlphaPBR;
LLTextBox* mLabelAlphaModePBR;
LLComboBox* mAlphaModePBR;
LLSpinCtrl* mMaskCutoffPBR;
LLSpinCtrl* mMetallicFactorPBR;
LLSpinCtrl* mRoughnessFactorPBR;
LLButton* mBtnSavePBR;
struct
{
std::array<LLUUID, LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT> mMap;
LLColor4 mBaseColorTint;
F32 mMetallic;
F32 mRoughness;
LLColor4 mEmissiveTint;
LLGLTFMaterial::AlphaMode mAlphaMode;
F32 mAlphaCutoff;
bool mDoubleSided;
} mPBRBaseMaterialParams;
// map PBR material map types to glTF material types
LLGLTFMaterial::TextureInfo mPBRChannelToTextureInfo[PBRTYPE_COUNT] =
{
LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT, // PBRTYPE_RENDER_MATERIAL_ID
LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR, // PBRTYPE_BASE_COLOR
LLGLTFMaterial::GLTF_TEXTURE_INFO_METALLIC_ROUGHNESS, // PBRTYPE_METALLIC_ROUGHNESS
LLGLTFMaterial::GLTF_TEXTURE_INFO_EMISSIVE, // PBRTYPE_EMISSIVE
LLGLTFMaterial::GLTF_TEXTURE_INFO_NORMAL // PBRTYPE_NORMAL
};
// Dirty flags - taken from llmaterialeditor.cpp ... LL please put this in a .h! -Zi
U32 mUnsavedChanges; // flags to indicate individual changed parameters
// Hey look everyone, a type-safe alternative to copy and paste! :)
//
// Update material parameters by applying 'edit_func' to selected TEs
//
template<
typename DataType,
typename SetValueType,
void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
static void edit(FSPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())
{
FSMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc > edit(data);
struct LLSelectedTEEditMaterial : public LLSelectedTEMaterialFunctor
{
LLSelectedTEEditMaterial(FSPanelFace* panel, FSMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp, const LLUUID &only_for_object_id) : _panel(panel), _edit(editp), _only_for_object_id(only_for_object_id) {}
virtual ~LLSelectedTEEditMaterial() {};
virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material)
{
if (_edit && (_only_for_object_id.isNull() || _only_for_object_id == object->getID()))
{
LLMaterialPtr new_material = _panel->createDefaultMaterial(current_material);
llassert_always(new_material);
// Determine correct alpha mode for current diffuse texture
// (i.e. does it have an alpha channel that makes alpha mode useful)
//
// _panel->isAlpha() "lies" when one face has alpha and the rest do not (NORSPEC-329)
// need to get per-face answer to this question for sane alpha mode retention on updates.
//
bool is_alpha_face = object->isImageAlphaBlended(face);
// need to keep this original answer for valid comparisons in logic below
//
U8 original_default_alpha_mode = is_alpha_face ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
U8 default_alpha_mode = original_default_alpha_mode;
if (!current_material.isNull())
{
default_alpha_mode = current_material->getDiffuseAlphaMode();
}
// Insure we don't inherit the default of blend by accident...
// this will be stomped by a legit request to change the alpha mode by the apply() below
//
new_material->setDiffuseAlphaMode(default_alpha_mode);
// Do "It"!
//
_edit->apply(new_material);
U32 new_alpha_mode = new_material->getDiffuseAlphaMode();
LLUUID new_normal_map_id = new_material->getNormalID();
LLUUID new_spec_map_id = new_material->getSpecularID();
if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face)
{
new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
}
bool is_default_blend_mode = (new_alpha_mode == original_default_alpha_mode);
bool is_need_material = !is_default_blend_mode || !new_normal_map_id.isNull() || !new_spec_map_id.isNull();
if (!is_need_material)
{
LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL;
LLMaterialMgr::getInstance()->remove(object->getID(),face);
new_material = NULL;
}
else
{
LL_DEBUGS("Materials") << "Putting material on object " << object->getID() << " face " << face << ", material: " << new_material->asLLSD() << LL_ENDL;
LLMaterialMgr::getInstance()->put(object->getID(),face,*new_material);
}
object->setTEMaterialParams(face, new_material);
return new_material;
}
return NULL;
}
FSMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* _edit;
FSPanelFace *_panel;
const LLUUID & _only_for_object_id;
} editor(p, &edit, only_for_object_id);
LLSelectMgr::getInstance()->selectionSetMaterialParams(&editor, te);
}
template<
typename DataType,
typename ReturnType,
ReturnType (LLMaterial::* const MaterialGetFunc)() const >
static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
{
DataType data_value = default_value;
struct GetTEMaterialVal : public LLSelectedTEGetFunctor<DataType>
{
GetTEMaterialVal(DataType default_value) : _default(default_value) {}
virtual ~GetTEMaterialVal() {}
DataType get(LLViewerObject* object, S32 face)
{
DataType ret = _default;
LLMaterialPtr material_ptr;
LLTextureEntry* tep = object ? object->getTE(face) : NULL;
if (tep)
{
material_ptr = tep->getMaterialParams();
if (!material_ptr.isNull())
{
ret = (material_ptr->*(MaterialGetFunc))();
}
}
return ret;
}
DataType _default;
} GetFunc(default_value);
identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetFunc, data_value, has_tolerance, tolerance);
data_to_return = data_value;
}
template<
typename DataType,
typename ReturnType, // some kids just have to different...
ReturnType (LLTextureEntry::* const TEGetFunc)() const >
static void getTEValue(DataType& data_to_return, bool& identical, DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
{
DataType data_value = default_value;
struct GetTEVal : public LLSelectedTEGetFunctor<DataType>
{
GetTEVal(DataType default_value) : _default(default_value) {}
virtual ~GetTEVal() {}
DataType get(LLViewerObject* object, S32 face) {
LLTextureEntry* tep = object ? object->getTE(face) : NULL;
return tep ? ((tep->*(TEGetFunc))()) : _default;
}
DataType _default;
} GetTEValFunc(default_value);
identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetTEValFunc, data_value, has_tolerance, tolerance );
data_to_return = data_value;
}
// Update vis and enabling of specific subsets of controls based on material params
// (e.g. hide the spec controls if no spec texture is applied)
//
void updateShinyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
void updateBumpyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
void updateAlphaControls();
void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values);
void updateSelectedGLTFMaterials(std::function<void(LLGLTFMaterial*)> func);
void updateGLTFTextureTransform(float value, U32 pbr_type, std::function<void(LLGLTFMaterial::TextureTransform*)> edit);
void setMaterialOverridesFromSelection();
bool mIsAlpha;
LLSD mClipboardParams;
LLSD mMediaSettings;
bool mNeedMediaTitle;
class Selection
{
public:
void connect();
// Returns true if the selected objects or sides have changed since
// this was last called, and no object update is pending
bool update();
// Prevents update() returning true until the provided object is
// updated. Necessary to prevent controls updating when the mouse is
// held down.
void setDirty() { mChanged = true; };
// Callbacks
void onSelectionChanged() { mNeedsSelectionCheck = true; }
void onSelectedObjectUpdated(const LLUUID &object_id, S32 side);
protected:
bool compareSelection();
bool mChanged = false;
boost::signals2::scoped_connection mSelectConnection;
bool mNeedsSelectionCheck = true;
S32 mSelectedObjectCount = 0;
S32 mSelectedTECount = 0;
LLUUID mSelectedObjectID;
S32 mLastSelectedSide = -1;
};
static Selection sMaterialOverrideSelection;
std::unique_ptr<PBRPickerAgentListener> mAgentInventoryListener;
std::unique_ptr<PBRPickerObjectListener> mVOInventoryListener;
public:
#if defined(FS_DEF_GET_MAT_STATE)
#undef FS_DEF_GET_MAT_STATE
#endif
#if defined(FS_DEF_GET_TE_STATE)
#undef FS_DEF_GET_TE_STATE
#endif
#if defined(FS_DEF_EDIT_MAT_STATE)
FS_DEF_EDIT_MAT_STATE
#endif
// Accessors for selected TE material state
//
#define FS_DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc,DefaultValue,HasTolerance,Tolerance) \
static void MaterialMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance) \
{ \
getTEMaterialValue< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance); \
}
// Mutators for selected TE material
//
#define FS_DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc) \
static void MaterialMemberFunc(FSPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID()) \
{ \
edit< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(p, data, te, only_for_object_id); \
}
// Accessors for selected TE state proper (legacy settings etc)
//
#define FS_DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc,DefaultValue,HasTolerance,Tolerance) \
static void TexEntryMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance) \
{ \
getTEValue< DataType, ReturnType, &LLTextureEntry::TexEntryMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance); \
}
class LLSelectedTEMaterial
{
public:
static void getCurrent(LLMaterialPtr& material_ptr, bool& identical_material);
static void getMaxSpecularRepeats(F32& repeats, bool& identical);
static void getMaxNormalRepeats(F32& repeats, bool& identical);
static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha);
FS_DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getNormalID,LLUUID::null, false, LLUUID::null)
FS_DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getSpecularID,LLUUID::null, false, LLUUID::null)
FS_DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatX,1.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatY,1.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetX,0.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetY,0.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getSpecularRotation,0.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getNormalRepeatX,1.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getNormalRepeatY,1.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getNormalOffsetX,0.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getNormalOffsetY,0.0f, true, 0.001f)
FS_DEF_GET_MAT_STATE(F32,F32,getNormalRotation,0.0f, true, 0.001f)
FS_DEF_EDIT_MAT_STATE(U8,U8,setDiffuseAlphaMode);
FS_DEF_EDIT_MAT_STATE(U8,U8,setAlphaMaskCutoff);
FS_DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetX);
FS_DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetY);
FS_DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatX);
FS_DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatY);
FS_DEF_EDIT_MAT_STATE(F32,F32,setNormalRotation);
FS_DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetX);
FS_DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetY);
FS_DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatX);
FS_DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatY);
FS_DEF_EDIT_MAT_STATE(F32,F32,setSpecularRotation);
FS_DEF_EDIT_MAT_STATE(U8,U8,setEnvironmentIntensity);
FS_DEF_EDIT_MAT_STATE(U8,U8,setSpecularLightExponent);
FS_DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID);
FS_DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID);
FS_DEF_EDIT_MAT_STATE(LLColor4U, const LLColor4U&,setSpecularLightColor);
};
class LLSelectedTE
{
public:
static void getFace(class LLFace*& face_to_return, bool& identical_face);
static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
static void getTexId(LLUUID& id, bool& identical);
static void getObjectScaleS(F32& scale_s, bool& identical);
static void getObjectScaleT(F32& scale_t, bool& identical);
static void getMaxDiffuseRepeats(F32& repeats, bool& identical);
FS_DEF_GET_TE_STATE(U8,U8,getBumpmap,0, false, 0)
FS_DEF_GET_TE_STATE(U8,U8,getShiny,0, false, 0)
FS_DEF_GET_TE_STATE(U8,U8,getFullbright,0, false, 0)
FS_DEF_GET_TE_STATE(F32,F32,getRotation,0.0f, true, 0.001f)
FS_DEF_GET_TE_STATE(F32,F32,getOffsetS,0.0f, true, 0.001f)
FS_DEF_GET_TE_STATE(F32,F32,getOffsetT,0.0f, true, 0.001f)
FS_DEF_GET_TE_STATE(F32,F32,getScaleS,1.0f, true, 0.001f)
FS_DEF_GET_TE_STATE(F32,F32,getScaleT,1.0f, true, 0.001f)
FS_DEF_GET_TE_STATE(F32,F32,getGlow,0.0f, true, 0.001f)
FS_DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen,LLTextureEntry::TEX_GEN_DEFAULT, false, LLTextureEntry::TEX_GEN_DEFAULT)
FS_DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor,LLColor4::white, false, LLColor4::black);
};
};
#endif

7
indra/newview/llface.cpp
View File

@ -1395,6 +1395,13 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
LLMaterial* mat = tep ? tep->getMaterialParams().get() : 0;
// </FS:ND>
LLGLTFMaterial* gltf_mat = tep->getGLTFRenderMaterial();
// <FS:Beq> show legacy when editing the fallback materials.
static LLCachedControl<bool> showSelectedinBP(gSavedSettings, "FSShowSelectedInBlinnPhong");
if( gltf_mat && getViewerObject()->isSelected() && showSelectedinBP )
{
gltf_mat = nullptr;
}
// </FS:Beq>
F32 r = 0, os = 0, ot = 0, ms = 0, mt = 0, cos_ang = 0, sin_ang = 0;

99
indra/newview/llfloatertools.cpp
View File

@ -94,6 +94,8 @@
#include "llvograss.h"
#include "llvotree.h"
#include "fspanelface.h" // <FS:Zi> switchable edit texture/materials panel
// Globals
LLFloaterTools *gFloaterTools = NULL;
bool LLFloaterTools::sShowObjectCost = true;
@ -174,8 +176,14 @@ void* LLFloaterTools::createPanelVolume(void* data)
void* LLFloaterTools::createPanelFace(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
floater->mPanelFace = new LLPanelFace();
return floater->mPanelFace;
// <FS:Zi> switchable edit texture/materials panel
// we should not need this here at all, we are adding the texture/materials
// panel in postBuild()
// floater->mPanelFace = new LLPanelFace();
// return floater->mPanelFace;
return floater->findChild<LLPanel>("Texture");
// </FS:Zi>
}
//static
@ -229,6 +237,27 @@ LLPCode toolData[]={
BOOL LLFloaterTools::postBuild()
{
// <FS:Zi> switchable edit texture/materials panel
LLPanel* panel;
if (gSavedSettings.getBOOL("FSUseNewTexturePanel"))
{
mFSPanelFace = new FSPanelFace;
panel = mFSPanelFace;
}
else
{
mPanelFace = new LLPanelFace;
panel = mPanelFace;
}
LLTabContainer::TabPanelParams params;
params.panel = panel;
params.insert_at = (LLTabContainer::eInsertionPoint) PANEL_FACE;
mTab = getChild<LLTabContainer>("Object Info Tabs");
mTab->addTabPanel(params);
// </FS:Zi>
// Hide until tool selected
setVisible(FALSE);
@ -367,7 +396,11 @@ void LLFloaterTools::changePrecision(S32 decimal_precision)
else if (decimal_precision > 7) decimal_precision = 7;
mPanelObject->changePrecision(decimal_precision);
mPanelFace->changePrecision(decimal_precision);
// <FS:Zi> switchable edit texture/materials panel
// mPanelFace->changePrecision(decimal_precision);
if (mPanelFace) mPanelFace->changePrecision(decimal_precision);
if (mFSPanelFace) mFSPanelFace->changePrecision(decimal_precision);
// </FS:Zi>
}
// Create the popupview with a dummy center. It will be moved into place
@ -431,6 +464,7 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
mPanelVolume(NULL),
mPanelContents(NULL),
mPanelFace(NULL),
mFSPanelFace(nullptr), // <FS:Zi> switchable edit texture/materials panel
mPanelLandInfo(NULL),
mCostTextBorder(NULL),
@ -470,7 +504,6 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
// <FS>
mCommitCallbackRegistrar.add("BuildTool.CopyKeys", boost::bind(&LLFloaterTools::onClickBtnCopyKeys,this));
mCommitCallbackRegistrar.add("BuildTool.Expand", boost::bind(&LLFloaterTools::onClickExpand,this));
mCommitCallbackRegistrar.add("BuildTool.Flip", boost::bind(&LLPanelFace::onCommitFlip, _1, _2));
// </FS>
// <FS:Ansariel> FIRE-7802: Grass and tree selection in build tool
@ -744,8 +777,20 @@ void LLFloaterTools::refresh()
mPanelPermissions->refresh();
mPanelObject->refresh();
mPanelVolume->refresh();
mPanelFace->refresh();
mPanelFace->refreshMedia();
// <FS:Zi> switchable edit texture/materials panel
// mPanelFace->refresh();
// mPanelFace->refreshMedia();
if (mPanelFace)
{
mPanelFace->refresh();
mPanelFace->refreshMedia();
}
if (mFSPanelFace)
{
mFSPanelFace->refresh();
mFSPanelFace->refreshMedia();
}
// <FS:Zi>
mPanelContents->refresh();
mPanelLandInfo->refresh();
@ -1142,7 +1187,11 @@ void LLFloaterTools::onClose(bool app_quitting)
LLViewerJoystick::getInstance()->moveAvatar(false);
// destroy media source used to grab media title
mPanelFace->unloadMedia();
// <FS:Zi> switchable edit texture/materials panel
// mPanelFace->unloadMedia();
if (mPanelFace) mPanelFace->unloadMedia();
if (mFSPanelFace) mFSPanelFace->unloadMedia();
// </FS:Zi>
// Different from handle_reset_view in that it doesn't actually
// move the camera if EditCameraMovement is not set.
@ -1626,3 +1675,39 @@ void LLFloaterTools::onSelectTreeGrassCombo()
}
}
// </FS:Ansariel>
// <FS:Zi> switchable edit texture/materials panel
void LLFloaterTools::refreshPanelFace()
{
if (mPanelFace) mPanelFace->refresh();
if (mFSPanelFace) mFSPanelFace->refresh();
}
LLRender::eTexIndex LLFloaterTools::getTextureDropChannel()
{
if (mPanelFace) return mPanelFace->getTextureDropChannel();
if (mFSPanelFace) return mFSPanelFace->getTextureDropChannel();
return LLRender::NUM_TEXTURE_CHANNELS; // invalid
}
LLRender::eTexIndex LLFloaterTools::getTextureChannelToEdit()
{
if (mPanelFace) return mPanelFace->getTextureChannelToEdit();
if (mFSPanelFace) return mFSPanelFace->getTextureChannelToEdit();
return LLRender::NUM_TEXTURE_CHANNELS; // invalid
}
LLGLTFMaterial::TextureInfo LLFloaterTools::getPBRDropChannel()
{
if (mPanelFace) return mPanelFace->getPBRDropChannel();
if (mFSPanelFace) return mFSPanelFace->getPBRDropChannel();
return LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; // invalid
}
LLMaterialPtr LLFloaterTools::createDefaultMaterial(LLMaterialPtr old_mat)
{
if (mPanelFace) return mPanelFace->createDefaultMaterial(old_mat);
if (mFSPanelFace) return mFSPanelFace->createDefaultMaterial(old_mat);
return nullptr; // invalid
}
// </FS:Zi>

22
indra/newview/llfloatertools.h
View File

@ -50,6 +50,14 @@ class LLParcelSelection;
class LLObjectSelection;
class LLLandImpactsObserver;
// <FS:Zi> switchable edit texture/materials panel
#include "llgltfmaterial.h"
#include "llmaterial.h"
#include "llrender.h"
class FSPanelFace;
// </FS:Zi>
typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
class LLFloaterTools
@ -107,7 +115,14 @@ public:
static void setGridMode(S32 mode);
LLPanelFace* getPanelFace() { return mPanelFace; }
// <FS:Zi> switchable edit texture/materials panel
// LLPanelFace* getPanelFace() { return mPanelFace; }
LLRender::eTexIndex getTextureDropChannel();
LLRender::eTexIndex getTextureChannelToEdit();
LLGLTFMaterial::TextureInfo getPBRDropChannel();
LLMaterialPtr createDefaultMaterial(LLMaterialPtr old_mat);
void refreshPanelFace();
// </FS:Zi>
void onClickBtnCopyKeys();
void onClickExpand();
@ -193,7 +208,7 @@ public:
LLPanelObject *mPanelObject;
LLPanelVolume *mPanelVolume;
LLPanelContents *mPanelContents;
LLPanelFace *mPanelFace;
// LLPanelFace *mPanelFace; // <FS:Zi> switchable edit texture/materials panel
LLPanelLandInfo *mPanelLandInfo;
LLViewBorder* mCostTextBorder;
@ -215,6 +230,9 @@ private:
S32 mExpandedHeight;
std::map<std::string, std::string> mStatusText;
LLPanelFace* mPanelFace; // <FS:Zi> switchable edit texture/materials panel
FSPanelFace* mFSPanelFace; // <FS:Zi> switchable edit texture/materials panel
public:
static bool sShowObjectCost;
static bool sPreviousFocusOnAvatar;

2
indra/newview/llpanelface.cpp
View File

@ -603,6 +603,8 @@ LLPanelFace::LLPanelFace()
mTitleMediaText(NULL),
mNeedMediaTitle(true)
{
buildFromFile("panel_tools_texture.xml"); // <FS:Zi> switchable edit texture/materials
USE_TEXTURE = LLTrans::getString("use_texture");
// <FS> Extended copy & paste buttons
//mCommitCallbackRegistrar.add("PanelFace.menuDoToSelected", boost::bind(&LLPanelFace::menuDoToSelected, this, _2));

163
indra/newview/llselectmgr.cpp
View File

@ -97,7 +97,7 @@
#include "llvovolume.h"
#include "pipeline.h"
#include "llviewershadermgr.h"
#include "llpanelface.h"
// #include "llpanelface.h" // <FS:Zi> switchable edit texture/materials panel - include not needed
// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
#include "rlvactions.h"
#include "rlvhandler.h"
@ -1919,8 +1919,52 @@ bool LLObjectSelection::applyRestrictedPbrMaterialToTEs(LLViewerInventoryItem* i
//-----------------------------------------------------------------------------
// selectionSetImage()
//-----------------------------------------------------------------------------
// <FS:Beq> Allow editing of non-PBR materials in-situ
template<bool IsPBR>
struct TextureApplyFunctor : public LLSelectedTEFunctor
{
LLViewerInventoryItem* mItem;
LLUUID mImageID;
TextureApplyFunctor(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mImageID(id) {}
bool apply(LLViewerObject* objectp, S32 te) override
{
if(!objectp || !objectp->permModify())
{
return false;
}
if (mItem && objectp->isAttachment())
{
const LLPermissions& perm = mItem->getPermissions();
BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
if (!unrestricted)
{
return false;
}
}
if (mItem)
{
if constexpr (IsPBR)
{
LLToolDragAndDrop::dropTextureOneFace(objectp, te, mItem, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null, false);
}
else
{
LLToolDragAndDrop::dropTextureOneFace(objectp, te, mItem, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null, false, -2); // -2 means no PBR
}
}
else // not an inventory item
{
objectp->setTEImage(te, LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
}
return true;
}
};
// </FS:Beq>
// *TODO: re-arch texture applying out of lltooldraganddrop
bool LLSelectMgr::selectionSetImage(const LLUUID& imageid)
bool LLSelectMgr::selectionSetImage(const LLUUID& imageid, bool isPBR)
{
// First for (no copy) textures and multiple object selection
LLViewerInventoryItem* item = gInventory.getItem(imageid);
@ -1935,60 +1979,73 @@ bool LLSelectMgr::selectionSetImage(const LLUUID& imageid)
return false;
}
struct f : public LLSelectedTEFunctor
{
LLViewerInventoryItem* mItem;
LLUUID mImageID;
f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mImageID(id) {}
bool apply(LLViewerObject* objectp, S32 te)
{
if(!objectp || !objectp->permModify())
{
return false;
}
// <FS:Beq> Allow editing of non-PBR materials in-situ
// struct f : public LLSelectedTEFunctor
// {
// LLViewerInventoryItem* mItem;
// LLUUID mImageID;
// f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mImageID(id) {}
// bool apply(LLViewerObject* objectp, S32 te)
// {
// if(!objectp || !objectp->permModify())
// {
// return false;
// }
// Might be better to run willObjectAcceptInventory
if (mItem && objectp->isAttachment())
{
const LLPermissions& perm = mItem->getPermissions();
BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
if (!unrestricted)
{
// Attachments are in world and in inventory simultaneously,
// at the moment server doesn't support such a situation.
return false;
}
}
// // Might be better to run willObjectAcceptInventory
// if (mItem && objectp->isAttachment())
// {
// const LLPermissions& perm = mItem->getPermissions();
// BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
// if (!unrestricted)
// {
// // Attachments are in world and in inventory simultaneously,
// // at the moment server doesn't support such a situation.
// return false;
// }
// }
if (mItem)
{
LLToolDragAndDrop::dropTextureOneFace(objectp,
te,
mItem,
LLToolDragAndDrop::SOURCE_AGENT,
LLUUID::null,
false);
}
else // not an inventory item
{
// Texture picker defaults aren't inventory items
// * Don't need to worry about permissions for them
// * Can just apply the texture and be done with it.
objectp->setTEImage(te, LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
}
return true;
}
};
// if (mItem)
// {
// LLToolDragAndDrop::dropTextureOneFace(objectp,
// te,
// mItem,
// LLToolDragAndDrop::SOURCE_AGENT,
// LLUUID::null,
// false);
// }
// else // not an inventory item
// {
// // Texture picker defaults aren't inventory items
// // * Don't need to worry about permissions for them
// // * Can just apply the texture and be done with it.
// objectp->setTEImage(te, LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
// }
// return true;
// }
// };
// </FS:Beq>
if (item && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
{
getSelection()->applyNoCopyTextureToTEs(item);
}
else
{
f setfunc(item, imageid);
getSelection()->applyToTEs(&setfunc);
// <FS:Beq> Allow editing of non-PBR materials in-situ
// f setfunc(item, imageid);
// getSelection()->applyToTEs(&setfunc);
TextureApplyFunctor<true> setfuncPBR(item, imageid); // For PBR textures
TextureApplyFunctor<false> setfuncBP(item, imageid); // For non-PBR textures
if(isPBR)
{
getSelection()->applyToTEs(&setfuncPBR);
}
else
{
getSelection()->applyToTEs(&setfuncBP);
}
// </FS:Beq>
}
@ -2258,7 +2315,9 @@ void LLSelectMgr::selectionRevertShinyColors()
LLMaterialPtr old_mat = object->getTEref(te).getMaterialParams();
if (!old_mat.isNull())
{
LLMaterialPtr new_mat = gFloaterTools->getPanelFace()->createDefaultMaterial(old_mat);
// <FS:Zi> switchable edit texture/materials panel
// LLMaterialPtr new_mat = gFloaterTools->getPanelFace()->createDefaultMaterial(old_mat);
LLMaterialPtr new_mat = gFloaterTools->createDefaultMaterial(old_mat);
new_mat->setSpecularLightColor(color);
object->getTEref(te).setMaterialParams(new_mat);
LLMaterialMgr::getInstance()->put(object->getID(), te, *new_mat);
@ -3174,7 +3233,9 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch)
if (tep && !tep->getMaterialParams().isNull())
{
LLMaterialPtr orig = tep->getMaterialParams();
LLMaterialPtr p = gFloaterTools->getPanelFace()->createDefaultMaterial(orig);
// <FS:Zi> switchable edit texture/materials panel
// LLMaterialPtr p = gFloaterTools->getPanelFace()->createDefaultMaterial(orig);
LLMaterialPtr p = gFloaterTools->createDefaultMaterial(orig);
p->setNormalRepeat(normal_scale_s, normal_scale_t);
p->setSpecularRepeat(specular_scale_s, specular_scale_t);
@ -3200,7 +3261,9 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch)
if (tep && !tep->getMaterialParams().isNull())
{
LLMaterialPtr orig = tep->getMaterialParams();
LLMaterialPtr p = gFloaterTools->getPanelFace()->createDefaultMaterial(orig);
// <FS:Zi> switchable edit texture/materials panel
// LLMaterialPtr p = gFloaterTools->getPanelFace()->createDefaultMaterial(orig);
LLMaterialPtr p = gFloaterTools->createDefaultMaterial(orig);
p->setNormalRepeat(normal_scale_s, normal_scale_t);
p->setSpecularRepeat(specular_scale_s, specular_scale_t);

2
indra/newview/llselectmgr.h
View File

@ -717,7 +717,7 @@ public:
void selectionSetDensity(F32 density);
void selectionSetRestitution(F32 restitution);
void selectionSetMaterial(U8 material);
bool selectionSetImage(const LLUUID& imageid); // could be item or asset id
bool selectionSetImage(const LLUUID& imageid, bool isPBR=true); // <FS:Beq/> inject PBR awareness.
bool selectionSetGLTFMaterial(const LLUUID& mat_id); // material id only
void selectionSetColor(const LLColor4 &color);
void selectionSetColorOnly(const LLColor4 &color); // Set only the RGB channels

55
indra/newview/lltooldraganddrop.cpp
View File

@ -60,7 +60,12 @@
#include "llviewerwindow.h"
#include "llvoavatarself.h"
#include "llworld.h"
#include "llpanelface.h"
// <FS:Zi> switchable edit texture/materials panel
// #include "llpanelface.h"
#include "llmaterial.h"
#include "llmaterialmgr.h"
// </FS:Zi>
#include "lluiusage.h"
// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1)
#include "rlvactions.h"
@ -1412,11 +1417,14 @@ void LLToolDragAndDrop::dropTexture(LLViewerObject* hit_obj,
// If user dropped a texture onto face it implies
// applying texture now without cancel, save to selection
LLPanelFace* panel_face = gFloaterTools->getPanelFace();
// LLPanelFace* panel_face = gFloaterTools->getPanelFace(); // <FS:Zi> switchable edit texture/materials panel
if (nodep
&& gFloaterTools->getVisible()
&& panel_face
&& panel_face->getTextureDropChannel() == 0 /*texture*/
// <FS:Zi> switchable edit texture/materials panel
// && panel_face
// && panel_face->getTextureDropChannel() == 0 /*texture*/
&& gFloaterTools->getTextureDropChannel() == 0 /*texture*/
// <FS:Zi>
&& nodep->mSavedTextures.size() > hit_face)
{
LLViewerTexture* tex = hit_obj->getTEImage(hit_face);
@ -1459,7 +1467,7 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
LLUUID asset_id = item->getAssetUUID();
if (hit_obj->getRenderMaterialID(hit_face).notNull() && !remove_pbr)
if (hit_obj->getRenderMaterialID(hit_face).notNull() && !remove_pbr && tex_channel >= -1) // <FS:Beq/> tex_channel -2 means ignorePBR then treat as -1, don't judge me.
{
// Overrides require textures to be copy and transfer free
LLPermissions item_permissions = item->getPermissions();
@ -1469,16 +1477,28 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
if (allow_adding_to_override)
{
LLGLTFMaterial::TextureInfo drop_channel = LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR;
LLPanelFace* panel_face = gFloaterTools->getPanelFace();
if (gFloaterTools->getVisible() && panel_face)
// <FS:Zi> switchable edit texture/materials panel
// LLPanelFace* panel_face = gFloaterTools->getPanelFace();
// if (gFloaterTools->getVisible() && panel_face)
// {
// drop_channel = panel_face->getPBRDropChannel();
// }
if (gFloaterTools->getVisible())
{
drop_channel = panel_face->getPBRDropChannel();
drop_channel = gFloaterTools->getPBRDropChannel();
}
// </FS:Zi>
set_texture_to_material(hit_obj, hit_face, asset_id, drop_channel);
LLGLTFMaterialList::flushUpdates(nullptr);
}
return;
}
// <FS:Beq> tex_channel -2 means ignorePBR then treat as -1
if(tex_channel < -1)
{
tex_channel = -1;
}
// </FS:Beq>
BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
if (!success)
{
@ -1495,11 +1515,16 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
LLTextureEntry* tep = hit_obj->getTE(hit_face);
LLPanelFace* panel_face = gFloaterTools->getPanelFace();
// <FS:Zi> switchable edit texture/materials panel
// LLPanelFace* panel_face = gFloaterTools->getPanelFace();
if (gFloaterTools->getVisible() && panel_face)
// if (gFloaterTools->getVisible() && panel_face)
if (gFloaterTools->getVisible())
// </FS:Zi>
{
tex_channel = (tex_channel > -1) ? tex_channel : panel_face->getTextureDropChannel();
// <FS:Zi> switchable edit texture/materials panel
// tex_channel = (tex_channel > -1) ? tex_channel : panel_face->getTextureDropChannel();
tex_channel = (tex_channel > -1) ? tex_channel : gFloaterTools->getTextureDropChannel();
switch (tex_channel)
{
@ -1514,7 +1539,9 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
if (tep)
{
LLMaterialPtr old_mat = tep->getMaterialParams();
LLMaterialPtr new_mat = panel_face->createDefaultMaterial(old_mat);
// <FS:Zi> switchable edit texture/materials panel
// LLMaterialPtr new_mat = panel_face->createDefaultMaterial(old_mat);
LLMaterialPtr new_mat = gFloaterTools->createDefaultMaterial(old_mat);
new_mat->setNormalID(asset_id);
tep->setMaterialParams(new_mat);
hit_obj->setTENormalMap(hit_face, asset_id);
@ -1526,7 +1553,9 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
if (tep)
{
LLMaterialPtr old_mat = tep->getMaterialParams();
LLMaterialPtr new_mat = panel_face->createDefaultMaterial(old_mat);
// <FS:Zi> switchable edit texture/materials panel
// LLMaterialPtr new_mat = panel_face->createDefaultMaterial(old_mat);
LLMaterialPtr new_mat = gFloaterTools->createDefaultMaterial(old_mat);
new_mat->setSpecularID(asset_id);
tep->setMaterialParams(new_mat);
hit_obj->setTESpecularMap(hit_face, asset_id);

15
indra/newview/lltoolface.cpp
View File

@ -43,8 +43,8 @@
#include "rlvactions.h"
// [/RLVa:KB]
// #include "llpanelface.h" // <FS:Zi> switchable edit texture/materials panel - include not needed
// <FS:Zi> Add control to drag texture faces around
#include "llpanelface.h"
#include "llspinctrl.h"
#include "llkeyboard.h"
#include "llwindow.h"
@ -290,11 +290,14 @@ void LLToolFace::render()
LLFloaterTools* toolsFloater=(LLFloaterTools*) LLFloaterReg::findInstance("build");
if(toolsFloater)
{
LLPanelFace* panelFace=toolsFloater->mPanelFace;
if(panelFace)
{
panelFace->refresh();
}
// <FS:Zi> switchable edit texture/materials panel
// LLPanelFace* panelFace=toolsFloater->mPanelFace;
// if(panelFace)
// {
// panelFace->refresh();
// }
toolsFloater->refreshPanelFace();
// </FS:Zi>
}
#ifdef TEXTURE_GRAB_UPDATE_REGULARLY

21
indra/newview/llvovolume.cpp
View File

@ -5521,6 +5521,10 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
const LLMatrix4* model_mat = NULL;
LLDrawable* drawable = facep->getDrawable();
if(!drawable)
{
return;
}
if (rigged)
{
@ -5556,6 +5560,15 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
auto* gltf_mat = (LLFetchedGLTFMaterial*)te->getGLTFRenderMaterial();
llassert(gltf_mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(te->getGLTFRenderMaterial()) != nullptr);
// <FS:Beq> show legacy when editing the fallback materials.
static LLCachedControl<bool> showSelectedinBP(gSavedSettings, "FSShowSelectedInBlinnPhong");
if( gltf_mat && facep->getViewerObject()->isSelected() && showSelectedinBP )
{
gltf_mat = nullptr;
}
// </FS:Beq>
if (gltf_mat != nullptr)
{
mat_id = gltf_mat->getHash(); // TODO: cache this hash
@ -6786,6 +6799,14 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
const LLTextureEntry* te = facep->getTextureEntry();
LLGLTFMaterial* gltf_mat = te->getGLTFRenderMaterial();
// <FS:Beq> show legacy when editing the fallback materials.
static LLCachedControl<bool> showSelectedinBP(gSavedSettings, "FSShowSelectedInBlinnPhong");
if( gltf_mat && facep->getViewerObject()->isSelected() && showSelectedinBP )
{
gltf_mat = nullptr;
}
// </FS:Beq>
if (hud_group && gltf_mat == nullptr)
{ //all hud attachments are fullbright

6
indra/newview/pipeline.cpp
View File

@ -107,7 +107,7 @@
#include "llfloaterpathfindingconsole.h"
#include "llfloaterpathfindingcharacters.h"
#include "llfloatertools.h"
#include "llpanelface.h"
// #include "llpanelface.h" // <FS:Zi> switchable edit texture/materials panel - include not needed
#include "llpathfindingpathtool.h"
#include "llscenemonitor.h"
#include "llprogressview.h"
@ -3660,7 +3660,9 @@ void LLPipeline::postSort(LLCamera &camera)
if (!gNonInteractive)
{
LLPipeline::setRenderHighlightTextureChannel(gFloaterTools->getPanelFace()->getTextureChannelToEdit());
// <FS:Zi> switchable edit texture/materials panel
// LLPipeline::setRenderHighlightTextureChannel(gFloaterTools->getPanelFace()->getTextureChannelToEdit());
LLPipeline::setRenderHighlightTextureChannel(gFloaterTools->getTextureChannelToEdit());
}
// Draw face highlights for selected faces.

2
indra/newview/skins/default/xui/az/floater_beacons.xml
View File

@ -20,7 +20,7 @@
<check_box label="Səs mənbələri" name="sounds"/>
<check_box label="Partikl mənbələri" name="particles"/>
<check_box label="Media mənbələri" name="moapbeacon"/>
<text name="label_objects">
<text name="label_direction">
Göstərmə istiqaməti:
</text>
<check_box label="Günəş" name="sun"/>

2
indra/newview/skins/default/xui/az/floater_scene_load_stats.xml
View File

@ -20,7 +20,7 @@
<stat_bar name="texture_cache_hits" label="Keşdə uyğunlaşma sürəti"/>
<stat_bar name="texture_cache_read_latency" label="Keş oxuma gecikməsi"/>
<stat_bar name="texture_decode_latency" label="Keş dekodlaşdırma gecikməsi"/>
<stat_bar name="texture_decode_latency" label="Keşə yazma gecikməsi"/>
<stat_bar name="texture_write_latency" label="Keşə yazma gecikməsi"/>
<stat_bar name="texture_fetch_latency" label="Keş seçmə gecikməsi"/>
<stat_bar name="texture_fetch_time" label="Keş seçmə vaxtı"/>
<stat_bar name="numimagesstat" label="Sayğac"/>

2
indra/newview/skins/default/xui/az/notifications.xml
View File

@ -3738,7 +3738,7 @@ Siz [TIME] saniyədən sonra '[BODYREGION]' üçün [RESOLUTION] bişmiş tekstu
Siz [TIME] saniyədən sonra '[BODYREGION]' üçün [RESOLUTION] bişmiş teksturasını yerli olaraq yenilədiniz.
</notification>
<notification name="CannotUploadTexture">
Teksturanı yükləmək mümkün deyil.
Teksturanı yükləmək mümkün deyil: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

4
indra/newview/skins/default/xui/az/panel_profile_pick.xml
View File

@ -10,8 +10,8 @@
<text name="location_label">Məkan:</text>
<line_editor name="pick_location">Yüklənir...</line_editor>
</layout_panel>
<layout_panel name="actions_lp">
<layout_stack name="actions_stack">
<layout_panel name="util_buttons_lp">
<layout_stack name="util_buttons_stack">
<layout_panel name="map_btn_lp">
<button name="show_on_map_btn" label="Xəritədə"/>
</layout_panel>

390
indra/newview/skins/default/xui/de/panel_fs_tools_texture.xml Normal file
View File

@ -0,0 +1,390 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Texture">
<panel.string name="paste_error_face_selection_mismatch">
Falls mehrere Flächen kopiert werden, müssen auf dem Zielobjekt dieselbe Anzahl an Flächen selektiert sein.
</panel.string>
<panel.string name="paste_error_object_face_count_mismatch">
Falls alle Flächen eines Objekts kopiert werden, muss das Zielobjekt dieselbe Anzahl an Flächen besitzen.
</panel.string>
<panel.string name="paste_error_inventory_not_found">
Eine oder mehrere Texturen wurden nicht im Inventar gefunden.
</panel.string>
<panel.string name="paste_options">
Textur-Parameter in Zwischenablage kopieren
</panel.string>
<tab_container name="tabs_material_type">
<panel label="PBR" name="panel_material_type_pbr">
<panel name="panel_material_maps">
<texture_picker label="Material" name="pbr_control" tool_tip="Klicken, um ein PBR-Material zu wählen"/>
<texture_picker label="Basis-Farbe" name="base_color_picker" tool_tip="Klicken, um eine Basis-Farbe (Albedo) zu wählen"/>
<color_swatch label="" name="base_color_tint_picker" tool_tip="Klicken, um den Farbton der Basis-Farbe zu wählen"/>
<button name="btn_select_same_gltf" tool_tip="Alle Oberflächen mit demselben GLTF-Material wie diesem auswählen"/>
<texture_picker label="Normal" name="normal_map_picker" tool_tip="Klicken, um die Normal-Map zu wählen"/>
<texture_picker label="Emissive" name="emissive_map_picker" tool_tip="Klicken, um die Emission-Map zu wählen"/>
<color_swatch label="" name="emissive_color_tint_picker" tool_tip="Klicken, um den Farbton der Emission zu wählen"/>
<texture_picker label="(O)RM" name="metallic_map_picker" tool_tip="Klicken, um die Map für metallische Unebenheit zu wählen, die einen optionalen Verdeckungskanal enthalten kann"/>
</panel>
<panel name="panel_material_parameters">
<check_box label="Doppelseitig" name="double sided"/>
<spinner label="Alpha" name="transparency"/>
<text name="blend mode label">
Modus
</text>
<combo_box top_delta="-3">
<combo_box.item label="Opak" name="None"/>
<combo_box.item label="Blending" name="Alpha blending"/>
<combo_box.item label="Masking" name="Alpha masking"/>
</combo_box>
<spinner label="Abschalt." name="alpha cutoff"/>
<spinner label="Metalligkeit" name="metalness factor"/>
<spinner label="Unebenheit" name="roughness factor"/>
<button name="save_selected_pbr" label="Speichern"/>
</panel>
<!-- BEGIN PBR Material texture transform parameters -->
<tab_container name="tabs_pbr_transforms">
<panel label="Alle" name="panel_pbr_transforms_all">
<panel name="pbr_transforms_all_scale">
<text name="pbr_transforms_all_scale_label">
Skalierung
</text>
<text name="labelGltfTextureScaleU_All">
U
</text>
<button name="flipTextureScaleMU" tool_tip="Invertieren"/>
<text name="labelGltfTextureScaleV_All">
V
</text>
<button name="flipTextureScaleMV" tool_tip="Invertieren"/>
</panel>
<panel name="pbr_transforms_all_offset">
<text name="pbr_transforms_all_offset_label">
Versatz
</text>
<text name="labelGltfTextureOffsetU_All">
U
</text>
<text name="labelGltfTextureOffsetV_All">
V
</text>
</panel>
<panel name="pbr_transforms_all_rotation">
<text name="pbr_transforms_all_rotation_label">
Rotation
</text>
</panel>
</panel>
<panel label="Basis-Farbe" name="panel_pbr_transforms_base_color">
<panel name="pbr_transforms_base_color_scale">
<text name="pbr_transforms_base_color_scale_label">
Skalierung
</text>
<text name="labelGltfTextureScaleU_Base">
U
</text>
<button name="flipTextureScaleMU" tool_tip="Invertieren"/>
<text name="labelGltfTextureScaleV_Base">
V
</text>
<button name="flipTextureScaleMV" tool_tip="Invertieren"/>
</panel>
<panel name="pbr_transforms_base_color_offset">
<text name="pbr_transforms_base_color_offset_label">
Versatz
</text>
<text name="labelGltfTextureOffsetU_Base">
U
</text>
<text name="labelGltfTextureOffsetV_Base">
V
</text>
</panel>
<panel name="pbr_transforms_base_color_rotation">
<text name="pbr_transforms_base_color_rotation_label">
Rotation
</text>
</panel>
</panel>
<panel label="Normal" name="panel_pbr_transforms_normal">
<panel name="pbr_transforms_normal_scale">
<text name="pbr_transforms_normal_scale_label">
Skalierung
</text>
<text name="labelGltfTextureScaleU_Normal">
U
</text>
<button name="flipTextureScaleMU" tool_tip="Invertieren"/>
<text name="labelGltfTextureScaleV_Normal">
V
</text>
<button name="flipTextureScaleMV" tool_tip="Invertieren"/>
</panel>
<panel name="pbr_transforms_normal_offset">
<text name="pbr_transforms_normal_offset_label">
Versatz
</text>
<text name="labelGltfTextureOffsetU_Normal">
U
</text>
<text name="labelGltfTextureOffsetV_Normal">
V
</text>
</panel>
<panel name="pbr_transforms_normal_rotation">
<text name="pbr_transforms_normal_rotation_label">
Rotation
</text>
</panel>
</panel>
<panel label="(O)RM" name="panel_pbr_transforms_metallic">
<panel name="pbr_transforms_orm_scale">
<text name="pbr_transforms_orm_scale_label">
Skalierung
</text>
<text name="labelGltfTextureScaleU_Metallic">
U
</text>
<button name="flipTextureScaleMU" tool_tip="Invertieren"/>
<text name="labelGltfTextureScaleV_Metallic">
V
</text>
<button name="flipTextureScaleMV" tool_tip="Invertieren"/>
</panel>
<panel name="pbr_transforms_orm_offset">
<text name="pbr_transforms_orm_offset_label">
Versatz
</text>
<text name="labelGltfTextureOffsetU_Metallic">
U
</text>
<text name="labelGltfTextureOffsetU_Metallic">
V
</text>
</panel>
<panel name="pbr_transforms_orm_rotation">
<text name="pbr_transforms_orm_rotation_label">
Rotation
</text>
</panel>
</panel>
<panel label="Emissive" name="panel_pbr_transforms_emissive">
<panel name="pbr_transforms_emissive_scale">
<text name="pbr_transforms_emissive_scale_label">
Skalierung
</text>
<text name="labelGltfTextureScaleU_Emissive">
U
</text>
<button name="flipTextureScaleMU" tool_tip="Invertieren"/>
<text name="labelGltfTextureScaleV_Emissive">
V
</text>
<button name="flipTextureScaleMV" tool_tip="Invertieren"/>
</panel>
<panel name="pbr_transforms_emissive_offset">
<text name="pbr_transforms_emissive_offset_label">
Versatz
</text>
<text name="labelGltfTextureOffsetU_Emissive">
U
</text>
<text name="labelGltfTextureOffsetV_Emissive">
V
</text>
</panel>
<panel name="pbr_transforms_emissive_rotation">
<text name="pbr_transforms_emissive_rotation_label">
Rotation
</text>
</panel>
</panel>
</tab_container>
</panel>
<panel label="Blinn-Phong" name="panel_material_type_blinn_phong">
<layout_stack name="panel_material_type_blinn_phong_layout_stack">
<layout_panel name="panel_blinn_phong_maps">
<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
<color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
<button name="btn_select_same_diff" tool_tip="Alle Oberflächen mit derselben Textur wie dieser auswählen"/>
<texture_picker label="Normal" name="bumpytexture control" tool_tip="Klicken, um ein Bild zu wählen"/>
<button name="btn_select_same_norm" tool_tip="Alle Oberflächen mit derselben Normal-Map wie dieser auswählen"/>
<texture_picker label="Specular" name="shinytexture control" tool_tip="Klicken, um ein Bild zu wählen"/>
<button name="btn_select_same_spec" tool_tip="Alle Oberflächen mit derselben Specular-Map wie dieser auswählen"/>
<color_swatch label="" name="shinycolorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
</layout_panel>
<layout_panel name="panel_blinn_phong_options">
<check_box label="Ganz hell" name="checkbox fullbright"/>
<spinner name="ColorTrans" label="Transparenz"/>
<text name="color trans percent">
%
</text>
<text name="label alphamode">
Alpha-Modus
</text>
<combo_box name="combobox alphamode">
<combo_box.item label="Keiner" name="None"/>
<combo_box.item label="Alpha-Blending" name="Alpha blending"/>
<combo_box.item label="Alpha-Masking" name="Alpha masking"/>
<combo_box.item label="Emissive Mask" name="Emissive mask"/>
</combo_box>
<spinner label="Abschaltung" name="maskcutoff"/>
<text name="label bumpiness">
Holprigkeit
</text>
<combo_box name="combobox bumpiness">
<combo_box.item label="Keine" name="None"/>
<combo_box.item label="Helligkeit" name="Brightness"/>
<combo_box.item label="Dunkelheit" name="Darkness"/>
<combo_box.item label="Holzmaserung" name="woodgrain"/>
<combo_box.item label="Rinde" name="bark"/>
<combo_box.item label="Ziegel" name="bricks"/>
<combo_box.item label="Karo" name="checker"/>
<combo_box.item label="Beton" name="concrete"/>
<combo_box.item label="verkrustete Fliesen" name="crustytile"/>
<combo_box.item label="Steinplatten" name="cutstone"/>
<combo_box.item label="Scheiben" name="discs"/>
<combo_box.item label="Kies" name="gravel"/>
<combo_box.item label="Petrischale" name="petridish"/>
<combo_box.item label="Verkleidung" name="siding"/>
<combo_box.item label="Steinfliesen" name="stonetile"/>
<combo_box.item label="Stuck" name="stucco"/>
<combo_box.item label="Saugen" name="suction"/>
<combo_box.item label="gewoben" name="weave"/>
<combo_box.item label="Textur benutzen" name="Use texture"/>
</combo_box>
<text name="label shininess">
Glänzen
</text>
<combo_box name="combobox shininess">
<combo_box.item label="Kein" name="None"/>
<combo_box.item label="Niedrig" name="Low"/>
<combo_box.item label="Mittel" name="Medium"/>
<combo_box.item label="Hoch" name="High"/>
</combo_box>
<spinner name="glossiness" label="Glanz"/>
<spinner name="environment" label="Umgebung"/>
</layout_panel>
</layout_stack>
<tab_container name="tabs_blinn_phong_uvs">
<panel label="Diffuse" name="panel_blinn_phong_diffuse">
<panel name="transforms_diffuse_scale">
<text name="transforms_diffuse_scale_label">
Skalierung
</text>
<text name="labelTexScaleU">
H
</text>
<button name="flipTextureScaleU" tool_tip="Invertieren"/>
<text name="labelTexScaleV">
V
</text>
<button name="flipTextureScaleV" tool_tip="Invertieren"/>
</panel>
<panel name="transforms_diffuse_offset">
<text name="transforms_diffuse_offset_label">
Versatz
</text>
<text name="labelTexOffsetU">
H
</text>
<text name="labelTexOffsetV">
V
</text>
</panel>
<panel name="transforms_diffuse_rotation">
<text name="transforms_diffuse_rotation_label">
Rotation
</text>
</panel>
</panel>
<panel label="Normal" name="panel_blinn_phong_normal">
<panel name="transforms_normal_scale">
<text name="transforms_normal_scale_label">
Skalierung
</text>
<text name="labelBumpyScaleU">
H
</text>
<button name="flipTextureScaleNU" tool_tip="Invertieren"/>
<text name="labelBumpyScaleV">
V
</text>
<button name="flipTextureScaleNV" tool_tip="Invertieren"/>
</panel>
<panel name="transforms_normal_offset">
<text name="transforms_normal_offset_label">
Versatz
</text>
<text name="labelBumpyOffsetU">
H
</text>
<text name="labelBumpyOffsetU">
V
</text>
</panel>
<panel name="transforms_normal_rotation">
<text name="transforms_normal_rotation_label">
Rotation
</text>
</panel>
</panel>
<panel label="Specular" name="panel_blinn_phong_specular">
<panel name="transforms_specular_scale">
<text name="transforms_specular_scale_label">
Skalierung
</text>
<text name="labelShinyScaleU">
H
</text>
<button name="flipTextureScaleSU" tool_tip="Invertieren"/>
<text name="labelShinyScaleV">
V
</text>
<button name="flipTextureScaleSV" tool_tip="Invertieren"/>
</panel>
<panel name="transforms_specular_offset">
<text name="transforms_specular_offset_label">
Versatz
</text>
<text name="labelShinyOffsetU">
H
</text>
<text name="labelShinyOffsetV">
V
</text>
</panel>
<panel name="transforms_specular_rotation">
<text name="transforms_specular_rotation_label">
Rotation
</text>
</panel>
</panel>
</tab_container>
</panel>
<panel label="Medien" name="panel_material_type_media">
<text name="media_info">
Ausgewählte Medien-URL
</text>
<button name="add_media" tool_tip="Medien hinzufügen" label="Auswählen..."/>
<button name="delete_media" tool_tip="Diese Medien-Textur löschen" label="Entfernen"/>
<button label="Ausrichten" label_selected="Medien angleichen" name="button align" tool_tip="Medientexturen angleichen (müssen zunächst geladen werden)"/>
</panel>
</tab_container>
<panel name="panel_face_params">
<spinner label="Wiederh. / Meter" name="rptctrl"/>
<check_box label="Materialien synchronisieren" name="checkbox_sync_settings" tool_tip="Synchronisiere Texture-Mapping-Parameter"/>
<check_box label="Planare Oberflächen ausrichten" name="checkbox planar align" tool_tip="Richtet Texturen auf allen ausgewählten Flächen wie die zuletzt ausgewählte Fläche aus. Erfordert planares Textur-Mapping."/>
<text name="tex gen">
Mapping
</text>
<combo_box name="combobox texgen">
<combo_box.item label="Standard" name="Default"/>
<combo_box.item label="Planar" name="Planar"/>
</combo_box>
<button name="button align textures" label="Ausrichten" tool_tip="Aktuelle Textur-Schicht ausrichten"/>
</panel>
<button name="copy_face_btn" tool_tip="Textur-Parameter in Zwischenablage kopieren"/>
<button name="paste_face_btn" tool_tip="Textur-Parameter aus Zwischenablage einfügen"/>
<spinner label="Leuchten" name="glow" label_width="50" width="115"/>
</panel>

4
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -3238,8 +3238,10 @@ Low ↔ Lwst
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
<panel
border="false"

3109
indra/newview/skins/default/xui/en/panel_fs_tools_texture.xml Normal file
View File

File diff suppressed because it is too large Load Diff

8
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -1654,6 +1654,14 @@
tool_tip="If enabled, the list of attachments spots in the &amp;Attach to&amp; menus will be sorted alphabetically"
name="FSSortAttachmentSpotsAlphabetically"
control_name="FSSortAttachmentSpotsAlphabetically"/>
<check_box
top_pad="8"
follows="left|top"
height="16"
label="Use the new Firestorm texture panel in the tools floater (requires restart)"
tool_tip="If enabled, the texture editing tools will use the refined FS workflow and allow editing of BlinnPhong"
name="FSUseNewTexturePanel"
control_name="FSUseNewTexturePanel"/>
</panel>
<!--Uploads-->

2
indra/newview/skins/default/xui/es/notifications.xml
View File

@ -3623,7 +3623,7 @@ Has actualizado una textura obtenida mediante bake de [RESOLUTION] para &apos;[B
Has actualizado de manera local una textura obtenida mediante bake de [RESOLUTION] para &apos;[BODYREGION]&apos; después de [TIME] segundos.
</notification>
<notification name="CannotUploadTexture">
No se puede subir la textura.
No se puede subir la textura: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

2
indra/newview/skins/default/xui/fr/floater_beacons.xml
View File

@ -20,7 +20,7 @@
<check_box label="Sources sonores" name="sounds"/>
<check_box label="Sources des particules" name="particles"/>
<check_box label="Sources des médias" name="moapbeacon"/>
<text name="label_objects">
<text name="label_direction">
Montrer la direction :
</text>
<check_box label="Soleil" name="sun"/>

2
indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
View File

@ -18,7 +18,7 @@
<stat_bar label="Taux de réussite du cache" name="texture_cache_hits"/>
<stat_bar label="Temps de lecture du cache" name="texture_cache_read_latency"/>
<stat_bar label="Temps de décodage du cache" name="texture_decode_latency" />
<stat_bar label="Temps du cache en écriture" name="texture_decode_latency" />
<stat_bar label="Temps du cache en écriture" name="texture_write_latency" />
<stat_bar label="Temps de lecture du cache" name="texture_fetch_latency" />
<stat_bar label="Temps de récupér. du cache" name="texture_fetch_time" />
<stat_bar label="Nombre" name="numimagesstat"/>

2
indra/newview/skins/default/xui/fr/floater_translation_settings.xml
View File

@ -33,7 +33,7 @@
<radio_item label="Google Translate" name="google"/>
<radio_item label="DeepL Translate" name="deepl"/>
</radio_group>
<text name="google_links_text">
<text name="azure_links_text">
[https://learn.microsoft.com/en-us/azure/cognitive-services/translator/create-translator-resource Guide]</text>
<text name="azure_api_endoint_label">Point final :</text>
<text name="azure_api_key_label">Clé Azure :</text>

2
indra/newview/skins/default/xui/fr/notifications.xml
View File

@ -3856,7 +3856,7 @@ Texture figée de [RESOLUTION] chargée pour [BODYREGION] au bout de [TIME] seco
Texture figée de [RESOLUTION] mise à jour localement pour [BODYREGION] au bout de [TIME] secondes.
</notification>
<notification name="CannotUploadTexture">
Chargement de la texture impossible.
Chargement de la texture impossible: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

4
indra/newview/skins/default/xui/fr/panel_profile_pick.xml
View File

@ -18,8 +18,8 @@
Chargement en cours...
</line_editor>
</layout_panel>
<layout_panel name="actions_lp">
<layout_stack name="actions_stack">
<layout_panel name="util_buttons_lp">
<layout_stack name="util_buttons_stack">
<layout_panel name="map_btn_lp">
<button name="show_on_map_btn" label="Montrer sur carte" />
</layout_panel>

2
indra/newview/skins/default/xui/it/floater_360capture.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater min_width="450" name="360capture" title="Foto Panoramica a 360°">
<panel name="ui_panel_left">
<text name="quality_level_label">

2
indra/newview/skins/default/xui/it/floater_avatar_render_settings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_avatar_render_settings" title="Eccezioni Rendering Avatar">
<string name="av_never_render" value="Mai"/>
<string name="av_always_render" value="Sempre"/>

2
indra/newview/skins/default/xui/it/floater_beacons.xml
View File

@ -20,7 +20,7 @@
<check_box label="Sorgenti suoni" name="sounds"/>
<check_box label="Sorgenti particelle" name="particles"/>
<check_box label="Sorgenti multimedia" name="moapbeacon"/>
<text name="label_objects">
<text name="label_direction">
Mostra direzione:
</text>
<check_box label="Sole" name="sun"/>

2
indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="delete_pref_preset" title="Elimina Preset">
<string name="title_graphic">
Elimina Preset Grafica

3
indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
View File

@ -24,6 +24,9 @@
<floater.string name="loading">
Caricamento in corso...
</floater.string>
<text name="obj_name">
Oggetto: [SOURCE_OBJECT]
</text>
<button label="Ripristina" name="Reset"/>
<check_box label="In esecuzione" left="4" name="running"/>
<check_box label="Usa le esperienze:" name="enable_xp"/>

2
indra/newview/skins/default/xui/it/floater_load_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="load_pref_preset" title="Carica Preset">
<string name="title_graphic">
Carica Preset Grafica

2
indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="save_camera_preset" title="Salva Preset Camera">
<string name="btn_label_save">
Salva

2
indra/newview/skins/default/xui/it/floater_save_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="save_pref_preset" title="Salva Preset Grafica">
<text name="Preset">
Digita un nome per il preset o selezionane uno esistente.

3
indra/newview/skins/default/xui/it/floater_script_preview.xml
View File

@ -3,6 +3,9 @@
<floater.string name="Title">
Script: [NAME]
</floater.string>
<text name="path_txt" tool_tip="Posizione: [PATH]">
Posizione: [PATH]
</text>
<text name="desc txt">
Descrizione:
</text>

16
indra/newview/skins/default/xui/it/floater_stats.xml
View File

@ -30,22 +30,6 @@
<stat_bar label="Memoria complessiva" name="rawmemstat"/>
<stat_bar label="Memoria impegnata" name="glboundmemstat"/>
</stat_view>
<stat_view label="Utilizzo memoria" name="memory">
<stat_bar label="Interfaccia utente" name="LLView"/>
<stat_bar label="Font" name="LLFontFreetype"/>
<stat_bar label="Inventario" name="LLInventoryObject"/>
<stat_bar label="Oggetti viewer" name="LLViewerObject"/>
<stat_bar label="Dati gruppo octree" name="LLViewerOctreeGroup"/>
<stat_bar label="Dati octree" name="LLViewerOctreeEntry"/>
<stat_bar label="Cache oggetti viewer" name="LLVOCacheEntry"/>
<stat_bar label="Disegnabili" name="LLDrawable"/>
<stat_bar label="Dati viso" name="LLFace"/>
<stat_bar label="Info disegno" name="LLDrawInfo"/>
<stat_bar label="Dati texture" name="LLTexture"/>
<stat_bar label="Dati immagine" name="LLImage"/>
<stat_bar label="Dati immagine GL" name="LLImageGL"/>
<stat_bar label="Buffer vertici" name="LLVertexBuffer"/>
</stat_view>
<stat_view label="Rete" name="network">
<stat_bar label="Pacchetti in ingresso" name="packetsinstat"/>
<stat_bar label="Pacchetti in uscita" name="packetsoutstat"/>

2
indra/newview/skins/default/xui/it/floater_translation_settings.xml
View File

@ -32,7 +32,7 @@
<text name="tip">
Seleziona il servizio di traduzione:
</text>
<text name="google_links_text">
<text name="azure_links_text">
[https://learn.microsoft.com/en-us/azure/cognitive-services/translator/create-translator-resource Setup]
</text>
<!-- <text name="azure_api_key_label">

2
indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="Gear Menu">
<menu_item_call label="Tocca" name="touch"/>
<menu_item_call label="Siediti" name="sit"/>

8
indra/newview/skins/default/xui/it/menu_lsl_font_size.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="menu_font_size">
<menu_item_check label="Piccolo" name="font_small" />
<menu_item_check label="Predefinito" name="font_monospace" />
<menu_item_check label="Medio" name="font_medium" />
<menu_item_check label="Grande" name="font_large" />
<menu_item_check label="Enorme" name="font_huge" />
</toggleable_menu>

2
indra/newview/skins/default/xui/it/menu_viewer.xml
View File

@ -445,11 +445,13 @@
<menu label="Forza un errore" name="Force Errors">
<menu_item_call label="Forza Breakpoint" name="Force Breakpoint"/>
<menu_item_call label="Forza LLError e Crash" name="Force LLError And Crash"/>
<menu_item_call label="Forza LLError, Messaggio e Crash" name="Force LLError Message And Crash"/>
<menu_item_call label="Forza Bad Memory Access" name="Force Bad Memory Access"/>
<menu_item_call label="Forza Bad Memory Access in Coroutine" name="Force Bad Memory Access in Coroutine" />
<menu_item_call label="Forza Infinite Loop" name="Force Infinite Loop"/>
<menu_item_call label="Forza Driver Crash" name="Force Driver Carsh"/>
<menu_item_call label="Forza Software Exception" name="Force Software Exception"/>
<menu_item_call label="Forza OS Exception" name="Force OS Exception" />
<menu_item_call label="Forza Software Exception in Coroutine" name="Force Software Exception in Coroutine" />
<menu_item_call label="Forza un Crash in a Thread" name="Force a Crash in a Thread" />
<menu_item_call label="Forza Disconnetti viewer" name="Force Disconnect Viewer"/>

10
indra/newview/skins/default/xui/it/notifications.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<notifications>
<global name="skipnexttime">
Non mostrare più la prossima volta
@ -2420,6 +2420,12 @@ Vuoi disattivare la modalità Non disturbare prima di completare questa transazi
Il cestino è troppo pieno. Ciò potrebbe causare problemi durante l&apos;accesso.
<usetemplate name="okcancelbuttons" notext="Svuota il cestino più tardi" yestext="Svuota il cestino adesso"/>
</notification>
<notification name="InventoryLimitReachedAIS">
Il tuo inventario sta riscontrando problemi. Contatta il supporto della tua grid.
</notification>
<notification name="InventoryLimitReachedAISAlert">
Il tuo inventario sta riscontrando problemi. Contatta il supporto della tua grid.
</notification>
<notification name="ConfirmClearBrowserCache">
Eliminare la cronologia viaggi, web e ricerche fatte?
<usetemplate name="okcancelbuttons" notext="Annulla" />
@ -3602,7 +3608,7 @@ Hai caricato una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; do
Hai aggiornato localmente una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; dopo [TIME] secondi.
</notification>
<notification name="CannotUploadTexture">
Impossibile caricare la texture.
Impossibile caricare la texture: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="CannotUploadMaterial">

2
indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Avanzata" name="advanced">
<panel.string name="middle_mouse">
Tasto centrale mouse

2
indra/newview/skins/default/xui/it/panel_preferences_controls.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Controlli" name="controls">
<combo_box name="key_mode">
<combo_box.item label="In terza persona" name="third_person" />

1
indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml
View File

@ -211,6 +211,7 @@
<check_box label="Espandi sempre le informazioni avanzate sull'anteprima dell'animazione" tool_tip="Espandi le informazioni avanzate sull'animazione nella finestra dell'anteprima dell'animazione per impostazione predefinita" name="FSAnimationPreviewExpanded" />
<check_box label="Abilita i dettagli estesi sulle informazioni degli script" tool_tip="Estendi la funzionalità delle informazioni di base sugli script con vari dettagli utili per i costruttori." name="FSScriptInfoExtended" />
<check_box label="Elenca i punti di attacco nei menu &quot;Attacca a&quot; in ordine alfabetico (richiede riavvio)" tool_tip="Se abilitato, i punti di attacco nei menu &quot;Attacca a&quot; verranno elencati in ordine alfabetico" name="FSSortAttachmentSpotsAlphabetically" />
<check_box label="Usa il nuovo pannello texture di Firestorm nella finestra Costruisci/Modifica (richiede riavvio)" tool_tip="Se abilitata, gli strumenti di modifica delle texture utilizzeranno il pannello FS migliorato e consentiranno la modifica di BlinnPhong" name="FSUseNewTexturePanel" />
</panel>
<panel label="Caricamenti" name="UploadsTab">
<text name="title">

2
indra/newview/skins/default/xui/it/panel_preferences_uploads.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Caricamenti" name="uploads">
<text name="title">
Cartelle correnti di destinazione dei caricamenti

4
indra/newview/skins/default/xui/it/panel_profile_pick.xml
View File

@ -18,8 +18,8 @@
Caricamento...
</line_editor>
</layout_panel>
<layout_panel name="actions_lp">
<layout_stack name="actions_stack">
<layout_panel name="util_buttons_lp">
<layout_stack name="util_buttons_stack">
<layout_panel name="map_btn_lp">
<button name="show_on_map_btn" label="Mappa" />
</layout_panel>

4
indra/newview/skins/default/xui/it/panel_sound_devices.xml
View File

@ -22,4 +22,8 @@
<text name="wait_text">
Attendi
</text>
<text name="disabled_text">
Spento
</text>
<button name="unmute_btn" label="Accendi" />
</panel>

2
indra/newview/skins/default/xui/it/panel_topinfo_bar.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="topinfo_bar">
<text name="parcel_info_text" value="(caricamento...)"/>
</panel>

4
indra/newview/skins/default/xui/it/sidepanel_item_info.xml
View File

@ -50,10 +50,10 @@
</text>
</layout_panel>
<layout_panel name="layout_item_permissions_sale">
<text name="permissions_label">
<text name="perm_modify">
Permessi
</text>
<text name="perm_modify">
<text name="you_perm_modify">
Tu puoi:
</text>
<check_box label="Modificare" name="CheckOwnerModify" />

6
indra/newview/skins/default/xui/it/strings.xml
View File

@ -5160,6 +5160,12 @@ Segnala abuso
<string name="texture_load_dimensions_error">
Impossibile caricare immagini di dimensioni superiori a [WIDTH]*[HEIGHT]
</string>
<string name="texture_load_format_error">
Formato immagine non valido
</string>
<string name="texture_load_empty_file">
Il file è vuoto
</string>
<string name="outfit_photo_load_dimensions_error">
Le dimensioni massime delle foto di abiti sono [WIDTH]*[HEIGHT]. Ridimensionare l&apos;immagine o usarne un&apos;altra
</string>

2
indra/newview/skins/default/xui/ja/floater_beacons.xml
View File

@ -20,7 +20,7 @@
<check_box label="音源" name="sounds"/>
<check_box label="パーティクル源" name="particles"/>
<check_box label="メディア源" name="moapbeacon"/>
<text name="label_objects">天体の方向：</text>
<text name="label_direction">天体の方向：</text>
<check_box label="太陽" name="sun"/>
<check_box label="月" name="moon"/>
</panel>

2
indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
View File

@ -17,7 +17,7 @@
<stat_bar name="texture_cache_hits" label="キャッシュヒット率" unit_label="％"/>
<stat_bar name="texture_cache_read_latency" label="キャッシュ読み込み遅延量" unit_label="秒"/>
<stat_bar name="texture_decode_latency" label="キャッシュデコード遅延量" unit_label="秒"/>
<stat_bar name="texture_decode_latency" label="キャッシュ書き込み遅延量" unit_label="秒"/>
<stat_bar name="texture_write_latency" label="キャッシュ書き込み遅延量" unit_label="秒"/>
<stat_bar name="texture_fetch_latency" label="キャッシュ取得遅延量" unit_label="秒"/>
<stat_bar name="texture_fetch_time" label="キャッシュ取得時間" unit_label="秒"/>
<stat_bar name="numimagesstat" label="カウント"/>

2
indra/newview/skins/default/xui/ja/notifications.xml
View File

@ -3914,7 +3914,7 @@ https://wiki.firestormviewer.org/fs_voice
&apos;[BODYREGION]&apos;の[RESOLUTION]のベークドテクスチャは[TIME]秒後にローカルに更新されました。
</notification>
<notification name="CannotUploadTexture">
テクスチャをアップロードできません。
テクスチャをアップロードできません: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

2
indra/newview/skins/default/xui/pl/floater_360capture.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="360capture" title="Zdjęcie 360°">
<panel name="ui_panel_left">
<text name="quality_level_label">

2
indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_avatar_render_settings" title="Wyjątki renderowania awatarów">
<string name="av_never_render" value="Nigdy"/>
<string name="av_always_render" value="Zawsze"/>

2
indra/newview/skins/default/xui/pl/floater_beacons.xml
View File

@ -20,7 +20,7 @@
<check_box label="Źródeł dźwięku" name="sounds"/>
<check_box label="Źródeł cząsteczek" name="particles"/>
<check_box label="Źródeł mediów" name="moapbeacon"/>
<text name="label_objects">
<text name="label_direction">
Pokazuj kierunek:
</text>
<check_box label="Słońce" name="sun" />

2
indra/newview/skins/default/xui/pl/floater_big_preview.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_big_preview" title="Podgląd" />

2
indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="delete_pref_preset" title="Usuń ustawienie">
<string name="title_graphic">
Usuń ustawienie graficzne

3
indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
View File

@ -24,6 +24,9 @@
<floater.string name="loading">
Wczytywanie...
</floater.string>
<text name="obj_name">
Obiekt: [SOURCE_OBJECT]
</text>
<button label="Zresetuj" label_selected="Zresetuj" name="Reset"/>
<check_box label="Włączony" name="running"/>
<check_box label="Przygoda:" name="enable_xp"/>

2
indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="load_pref_preset" title="Wczytaj ustawienie">
<string name="title_graphic">
Wczytaj ustawienie graficzne

2
indra/newview/skins/default/xui/pl/floater_save_camera_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="save_camera_preset" title="Zapisz ustawienie kamery">
<string name="btn_label_save">
Zapisz

2
indra/newview/skins/default/xui/pl/floater_save_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="save_pref_preset" title="Zapisz ustawienie graficzne">
<text name="Preset">
Wpisz nazwę ustawienia lub wybierz już istniejące.

2
indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
View File

@ -17,7 +17,7 @@
<stat_bar name="texture_cache_hits" label="Wspł. trafień do cache"/>
<stat_bar name="texture_cache_read_latency" label="Opóźnienie odczytu cache"/>
<stat_bar name="texture_decode_latency" label="Opóźn. dekodowania cache" />
<stat_bar name="texture_decode_latency" label="Opóźn. zapisu cache" />
<stat_bar name="texture_write_latency" label="Opóźn. zapisu cache" />
<stat_bar name="texture_fetch_latency" label="Opóźn. pobierania cache" />
<stat_bar name="texture_fetch_time" label="Czas pob. z cache" />
<stat_bar name="numimagesstat" label="Suma"/>

3
indra/newview/skins/default/xui/pl/floater_script_preview.xml
View File

@ -3,6 +3,9 @@
<floater.string name="Title">
Skrypt: [NAME]
</floater.string>
<text name="path_txt" tool_tip="Lokalizacja: [PATH]">
Lokalizacja: [PATH]
</text>
<text name="desc txt">
Opis:
</text>

16
indra/newview/skins/default/xui/pl/floater_stats.xml
View File

@ -36,22 +36,6 @@
<stat_view name="material" label="Materiały">
<stat_bar name="nummaterials" label="Ilość" />
</stat_view>
<stat_view name="memory" label="Użycie pamięci">
<stat_bar name="LLView" label="Interfejs"/>
<stat_bar name="LLFontFreetype" label="Czcionki"/>
<stat_bar name="LLInventoryObject" label="Szafa"/>
<stat_bar name="LLViewerObject" label="Obiekty przeglądarki"/>
<stat_bar name="LLViewerOctreeGroup" label="Dane grupy drzewa ósemkowego"/>
<stat_bar name="LLViewerOctreeEntry" label="Dane drzewa ósemkowego"/>
<stat_bar name="LLVOCacheEntry" label="Pamięć podr. obiektów przegl."/>
<stat_bar name="LLDrawable" label="Obiekty rysowane"/>
<stat_bar name="LLFace" label="Dane powierzchni"/>
<stat_bar name="LLDrawInfo" label="Informacje rysowania"/>
<stat_bar name="LLTexture" label="Dane tekstur"/>
<stat_bar name="LLImage" label="Dane obrazów"/>
<stat_bar name="LLImageGL" label="Dane obrazu GL"/>
<stat_bar name="LLVertexBuffer" label="Bufory wierzchołków"/>
</stat_view>
<stat_view label="Sieć" name="network">
<stat_bar label="Pakiety wchodzące" name="packetsinstat"/>
<stat_bar label="Pakiety wychodzące" name="packetsoutstat"/>

2
indra/newview/skins/default/xui/pl/floater_tools.xml
View File

@ -222,7 +222,7 @@
<combo_box.item label="Brak" name="None"/>
</combo_box>
<check_box label="Na sprzedaż:" name="checkbox for sale" tool_tip="Pozwala ludziom kupować ten obiekt, jego zawartość lub kopię w świecie za określoną cenę." />
<combo_box name="sale type" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiou, kopię samej zawartości przedmiou lub oryginalny przedmiot w ogóle.">
<combo_box name="sale type" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiotu, kopię samej zawartości przedmiotu lub oryginalny przedmiot w ogóle.">
<combo_box.item label="Kopia" name="Copy"/>
<combo_box.item label="Zawartość" name="Contents"/>
<combo_box.item label="Oryginał" name="Original"/>

2
indra/newview/skins/default/xui/pl/floater_translation_settings.xml
View File

@ -32,7 +32,7 @@
<text name="tip">
Usługa tłumacząca:
</text>
<text name="google_links_text">
<text name="azure_links_text">
[https://learn.microsoft.com/en-us/azure/cognitive-services/translator/create-translator-resource Wskazówki]
</text>
<text name="azure_api_key_label">

2
indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="Gear Menu">
<menu_item_call label="Dotknij" name="touch"/>
<menu_item_call label="Usiądź" name="sit"/>

8
indra/newview/skins/default/xui/pl/menu_lsl_font_size.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="menu_font_size">
<menu_item_check label="Mała" name="font_small" />
<menu_item_check label="Domyślna" name="font_monospace" />
<menu_item_check label="Średnia" name="font_medium" />
<menu_item_check label="Duża" name="font_large" />
<menu_item_check label="Ogromna" name="font_huge" />
</toggleable_menu>

1
indra/newview/skins/default/xui/pl/menu_viewer.xml
View File

@ -454,6 +454,7 @@
<menu_item_call label="Wymuś nieskończoną pętlę" name="Force Infinite Loop"/>
<menu_item_call label="Wymuś awarię sterownika" name="Force Driver Carsh"/>
<menu_item_call label="Wymuś wyjątek programu" name="Force Software Exception"/>
<menu_item_call label="Wymuś wyjątek systemu operacyjnego" name="Force OS Exception" />
<menu_item_call label="Wymuś wyjątek we współprogramie (coroutine)" name="Force Software Exception in Coroutine" />
<menu_item_call label="Wymuś awarię w wątku" name="Force a Crash in a Thread" />
<menu_item_call label="Wymuś rozłączenie Przeglądarki" name="Force Disconnect Viewer"/>

8
indra/newview/skins/default/xui/pl/notifications.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<notifications>
<global name="skipnexttime">
Nie pokazuj tego ponownie
@ -2492,10 +2492,10 @@ Czy chcesz je odtworzyć?
Twój kosz się przepełnia. Może to sprawić, że będziesz mieć problemy z zalogowaniem się.
<usetemplate name="okcancelbuttons" notext="Wyczyszczę kosz ręcznie później" yestext="Sprawdź kosz teraz" />
</notification>
<notification name="InventoryLimitReachedAISAlert">
<notification name="InventoryLimitReachedAIS">
W Twojej Szafie występują problemy. Skontaktuj się z pomocą techniczną swojego świata.
</notification>
<notification name="InventoryLimitReachedAIS">
<notification name="InventoryLimitReachedAISAlert">
W Twojej Szafie występują problemy. Skontaktuj się z pomocą techniczną swojego świata.
</notification>
<notification name="ConfirmClearBrowserCache">
@ -3701,7 +3701,7 @@ Wstępnie przetworzone tekstury [RESOLUTION] dla &apos;[BODYREGION]&apos; zosta
Wstępnie przetworzone tekstury [RESOLUTION] zostały lokalnie zaktualizowane dla &apos;[BODYREGION]&apos; po [TIME] sekundach.
</notification>
<notification name="CannotUploadTexture">
Nie można przesłać tekstury.
Nie można przesłać tekstury: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="CannotUploadMaterial">

287
indra/newview/skins/default/xui/pl/panel_fs_tools_texture.xml Normal file
View File

@ -0,0 +1,287 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Tekstura" name="Texture">
<panel.string name="paste_error_face_selection_mismatch">
Gdy kopiowanych jest wiele stron, to obiekt docelowy musi mieć wybraną taką samą ich liczbę.
</panel.string>
<panel.string name="paste_error_object_face_count_mismatch">
Gdy kopiowane są wszystkie strony, to obiekt docelowy musi mieć taką samą ich liczbę.
</panel.string>
<panel.string name="paste_error_inventory_not_found">
Nie znaleziono jednej lub więcej tekstur.
</panel.string>
<panel.string name="paste_options">
Skopiuj parametry tekstury do schowka
</panel.string>
<tab_container name="tabs_material_type">
<panel name="panel_material_type_pbr">
<panel name="panel_material_maps">
<texture_picker name="pbr_control" label="Materiał" tool_tip="Kliknij, aby wybrać materiał PBR" />
<texture_picker name="base_color_picker" label="Bazowy" tool_tip="Kliknij, aby wybrać bazową mapę kolorów (Albedo)" />
<color_swatch name="base_color_tint_picker" label="Kolor" tool_tip="Kliknij, aby wybrać odcień koloru bazowego" />
<button name="btn_select_same_gltf" tool_tip="Wybierz wszystkie powierzchnie z takim samym materiałem GLTF jak ta" />
<texture_picker name="normal_map_picker" label="Normalne" tool_tip="Kliknij, aby wybrać mapę normalnych" />
<texture_picker name="emissive_map_picker" label="Emisyjność" tool_tip="Kliknij, aby wybrać mapę emisyjności" />
<color_swatch name="emissive_color_tint_picker" label="Kolor" tool_tip="Kliknij, aby wybrać odcień koloru emisyjności" />
<texture_picker name="metallic_map_picker" tool_tip="Kliknij, aby wybrać mapę chropowatości metalicznej, która może zawierać opcjonalny kanał okluzji" />
</panel>
<panel name="panel_material_parameters">
<check_box label="Dwustronny" name="double sided" />
<spinner label="Alfa" name="transparency" />
<text name="blend mode label">
Tryb
</text>
<combo_box name="alpha mode">
<combo_box.item label="Brak" name="None" />
<combo_box.item label="Przenikanie" name="Alpha blending" />
<combo_box.item label="Maskowanie" name="Alpha masking" />
</combo_box>
<spinner label="Odcięcie" name="alpha cutoff" />
<spinner label="Metaliczn." name="metalness factor" />
<spinner label="Chropowat." name="roughness factor" />
<button name="save_selected_pbr" label="Zapisz" />
</panel>
<tab_container name="tabs_pbr_transforms">
<panel label="Razem" name="panel_pbr_transforms_all">
<panel name="pbr_transforms_all_scale">
<text name="pbr_transforms_all_scale_label">
Skala
</text>
<button name="flipTextureScaleMU" tool_tip="Odwróć" />
<button name="flipTextureScaleMV" tool_tip="Odwróć" />
</panel>
<panel name="pbr_transforms_all_offset">
<text name="pbr_transforms_all_offset_label">
Przesun.
</text>
</panel>
<panel name="pbr_transforms_all_rotation">
<text name="pbr_transforms_all_rotation_label">
Obrót
</text>
</panel>
</panel>
<panel label="Bazowy" name="panel_pbr_transforms_base_color">
<panel name="pbr_transforms_base_color_scale">
<text name="pbr_transforms_base_color_scale_label">
Skala
</text>
<button name="flipTextureScaleMU" tool_tip="Odwróć" />
<button name="flipTextureScaleMV" tool_tip="Odwróć" />
</panel>
<panel name="pbr_transforms_base_color_offset">
<text name="pbr_transforms_base_color_offset_label">
Przesun.
</text>
</panel>
<panel name="pbr_transforms_base_color_rotation">
<text name="pbr_transforms_base_color_rotation_label">
Obrót
</text>
</panel>
</panel>
<panel label="Normalne" name="panel_pbr_transforms_normal">
<panel name="pbr_transforms_normal_scale">
<text name="pbr_transforms_normal_scale_label">
Skala
</text>
<button name="flipTextureScaleMU" tool_tip="Odwróć" />
<button name="flipTextureScaleMV" tool_tip="Odwróć" />
</panel>
<panel name="pbr_transforms_normal_offset">
<text name="pbr_transforms_normal_offset_label">
Przesun.
</text>
</panel>
<panel name="pbr_transforms_normal_rotation">
<text name="pbr_transforms_normal_rotation_label">
Obrót
</text>
</panel>
</panel>
<panel name="panel_pbr_transforms_metallic">
<panel name="pbr_transforms_orm_scale">
<text name="pbr_transforms_orm_scale_label">
Skala
</text>
<button name="flipTextureScaleMU" tool_tip="Odwróć" />
<button name="flipTextureScaleMV" tool_tip="Odwróć" />
</panel>
<panel name="pbr_transforms_orm_offset">
<text name="pbr_transforms_orm_offset_label">
Przesun.
</text>
</panel>
<panel name="pbr_transforms_orm_rotation">
<text name="pbr_transforms_orm_rotation_label">
Obrót
</text>
</panel>
</panel>
<panel label="Emisyjn." name="panel_pbr_transforms_emissive">
<panel name="pbr_transforms_emissive_scale">
<text name="pbr_transforms_emissive_scale_label">
Skala
</text>
<button name="flipTextureScaleMU" tool_tip="Odwróć" />
<button name="flipTextureScaleMV" tool_tip="Odwróć" />
</panel>
<panel name="pbr_transforms_emissive_offset">
<text name="pbr_transforms_emissive_offset_label">
Przesun.
</text>
</panel>
<panel name="pbr_transforms_emissive_rotation">
<text name="pbr_transforms_emissive_rotation_label">
Obrót
</text>
</panel>
</panel>
</tab_container>
</panel>
<panel name="panel_material_type_blinn_phong">
<layout_stack name="panel_material_type_blinn_phong_layout_stack">
<layout_panel name="panel_blinn_phong_maps">
<texture_picker name="texture control" label="Tekstura" tool_tip="Kliknij, aby wybrać obraz" />
<color_swatch name="colorswatch" label="Kolor" tool_tip="Kliknij, aby wybrać kolor" />
<button name="btn_select_same_diff" tool_tip="Wybierz wszystkie powierzchnie z taką samą teksturą (diffuse) jak ta" />
<texture_picker label="Normalne" name="bumpytexture control" tool_tip="Kliknij, aby wybrać obraz" />
<button name="btn_select_same_norm" tool_tip="Wybierz wszystkie powierzchnie z taką samą mapą normalnych jak ta" />
<texture_picker label="Lśnienie" name="shinytexture control" tool_tip="Kliknij, aby wybrać obraz" />
<color_swatch label="Kolor" name="shinycolorswatch" tool_tip="Kliknij, aby wybrać kolor" />
<button name="btn_select_same_spec" tool_tip="Wybierz wszystkie powierzchnie z taką samą mapą lśnienia (specular) jak ta" />
</layout_panel>
<layout_panel name="panel_blinn_phong_options">
<check_box label="Superjasna" name="checkbox fullbright" />
<spinner name="ColorTrans" label="Przezrocz." />
<text name="label alphamode">
Tryb alphy
</text>
<combo_box name="combobox alphamode">
<combo_box.item label="Brak" name="None" />
<combo_box.item label="Przenikanie" name="Alpha blending" />
<combo_box.item label="Maskowanie" name="Alpha masking" />
<combo_box.item label="Maska emisyjna" name="Emissive mask" />
</combo_box>
<spinner label="Odcięcie maski" name="maskcutoff" />
<text name="label bumpiness">
Powierzchnia
</text>
<combo_box name="combobox bumpiness">
<combo_box.item label="Bez mapowania" name="None" />
<combo_box.item label="Rozjaśnienie" name="Brightness" />
<combo_box.item label="Przyciemnienie" name="Darkness" />
<combo_box.item label="Włókna drewna" name="woodgrain" />
<combo_box.item label="Kora drzewa" name="bark" />
<combo_box.item label="Cegły" name="bricks" />
<combo_box.item label="Plansza szachowa" name="checker" />
<combo_box.item label="Beton" name="concrete" />
<combo_box.item label="Płytki/Kafelki" name="crustytile" />
<combo_box.item label="Kamień" name="cutstone" />
<combo_box.item label="Dyski" name="discs" />
<combo_box.item label="Żwir" name="gravel" />
<combo_box.item label="Skamieliny" name="petridish" />
<combo_box.item label="Brzeg" name="siding" />
<combo_box.item label="Płytka kamienna" name="stonetile" />
<combo_box.item label="Stiuk (gips ozdobny)" name="stucco" />
<combo_box.item label="Ssawki" name="suction" />
<combo_box.item label="Splot" name="weave" />
</combo_box>
<text name="label shininess">
Połysk
</text>
<combo_box name="combobox shininess">
<combo_box.item label="Żaden" name="None" />
<combo_box.item label="Niski" name="Low" />
<combo_box.item label="Średni" name="Medium" />
<combo_box.item label="Wysoki" name="High" />
</combo_box>
<spinner name="glossiness" label="Gładkość" />
<spinner name="environment" label="Otoczenie" />
</layout_panel>
</layout_stack>
<tab_container name="tabs_blinn_phong_uvs">
<panel label="Tekstura" name="panel_blinn_phong_diffuse">
<panel name="transforms_diffuse_scale">
<text name="transforms_diffuse_scale_label">
Skala
</text>
<button name="flipTextureScaleU" tool_tip="Odwróć" />
<button name="flipTextureScaleV" tool_tip="Odwróć" />
</panel>
<panel name="transforms_diffuse_offset">
<text name="transforms_diffuse_offset_label">
Przesun.
</text>
</panel>
<panel name="transforms_diffuse_rotation">
<text name="transforms_diffuse_rotation_label">
Obrót
</text>
</panel>
</panel>
<panel label="Normalne" name="panel_blinn_phong_normal">
<panel name="transforms_normal_scale">
<text name="transforms_normal_scale_label">
Skala
</text>
<button name="flipTextureScaleNU" tool_tip="Odwróć" />
<button name="flipTextureScaleNV" tool_tip="Odwróć" />
</panel>
<panel name="transforms_normal_offset">
<text name="transforms_normal_offset_label">
Przesun.
</text>
</panel>
<panel name="transforms_normal_rotation">
<text name="transforms_normal_rotation_label">
Obrót
</text>
</panel>
</panel>
<panel label="Lśnienie" name="panel_blinn_phong_specular">
<panel name="transforms_specular_scale">
<text name="transforms_specular_scale_label">
Skala
</text>
<button name="flipTextureScaleSU" tool_tip="Odwróć" />
<button name="flipTextureScaleSV" tool_tip="Odwróć" />
</panel>
<panel name="transforms_specular_offset">
<text name="transforms_specular_offset_label">
Przesun.
</text>
</panel>
<panel name="transforms_specular_rotation">
<text name="transforms_specular_rotation_label">
Obrót
</text>
</panel>
</panel>
</tab_container>
</panel>
<panel name="panel_material_type_media">
<text name="media_info">
Wybrany URL mediów, jeśli jest obecny
</text>
<button name="add_media" label="Wybierz..." tool_tip="Dodaj media" />
<button name="delete_media" label="Usuń" tool_tip="Usuń tę teksturę mediów" />
<button name="button align" label="Dopasuj" label_selected="Dopasuj Media" tool_tip="Wyrównaj teksturę mediów (musi się najpierw załadować)" />
</panel>
</tab_container>
<panel name="panel_face_params">
<spinner name="rptctrl" label="Powtórzenia / metr" />
<check_box label="Synchronizuj materiały" name="checkbox_sync_settings" tool_tip="Synchronizuj parametry map tekstur" />
<check_box label="Równaj powierzchnie planarne" name="checkbox planar align" tool_tip="Wyrównuj tekstury na wszystkich wybranych powierzchniach z powierzchnią wybraną jako ostatnia. Wymaga planarnego mapowania tekstur." />
<text name="tex gen">
Mapowanie
</text>
<combo_box name="combobox texgen">
<combo_box.item label="Domyślne" name="Default" />
<combo_box.item label="Planarne" name="Planar" />
</combo_box>
<button label="Wyrównaj" name="button align textures" tool_tip="Wyrównaj bieżące warstwy tekstury" />
</panel>
<button name="copy_face_btn" tool_tip="Skopiuj parametry tekstury do schowka" />
<button name="paste_face_btn" tool_tip="Wklej parametry tekstury ze schowka" />
<spinner label="Blask" name="glow" />
</panel>

2
indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Zaawansowane" name="advanced">
<panel.string name="middle_mouse">
Środkowy przycisk myszki

2
indra/newview/skins/default/xui/pl/panel_preferences_controls.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Sterowanie" name="controls">
<combo_box name="key_mode">
<combo_box.item label="W trzeciej osobie" name="third_person" />

3
indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
View File

@ -140,7 +140,7 @@
<color_swatch label="Kolor" name="colorswatch" tool_tip="Kliknij, aby wybrać kolor"/>
<spinner label="Przezr." name="alpha"/>
<spinner label="Blask" name="glow"/>
<check_box label="Pełna jasność" name="EmFBToggle"/>
<check_box label="Superjasność" name="EmFBToggle"/>
<combo_box name="combobox shininess" tool_tip="Określ, jak mocny połysk ma mieć obiekt">
<combo_item name="None" label="Żaden"/>
<combo_item name="Low" label="Niski"/>
@ -214,6 +214,7 @@
<check_box label="Zawsze rozwijaj zaawansowane informacje o podglądzie animacji" tool_tip="Domyślnie rozwiń zaawansowane informacje o animacji w oknie podglądu animacji" name="FSAnimationPreviewExpanded" />
<check_box label="Włącz rozszerzanie funkcjonalności informacji o skryptach" tool_tip="Gdy zaznaczysz tą opcję, to podstawowa funkcjonalność informacji o skryptach zostanie rozszerzona za pomocą różnych szczegółów przydatnych dla budowniczych" name="FSScriptInfoExtended" />
<check_box label="Sortuj miejsca dodatków w sekcjach menu &quot;Dołącz do&quot; alfabetycznie (wymaga restartu)" tool_tip="Jeśli ta opcja jest włączona, to lista miejsc dla doczepienia dodatków pojawiająca się w menusach &quot;Dołącz do&quot; będzie posortowana alfabetycznie" name="FSSortAttachmentSpotsAlphabetically" />
<check_box label="Nowy panel tekstur Firestorma w panelu budowania (wymaga restartu)" tool_tip="Gdy zaznaczysz tą opcję, to narzędzia do edycji tekstur będą korzystać z udoskonalonego panelu FS i pozwolą na edycję BlinnPhong" name="FSUseNewTexturePanel" />
</panel>
<panel label="Nowe pliki" name="UploadsTab">
<text name="title">

2
indra/newview/skins/default/xui/pl/panel_preferences_uploads.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Uploads" name="uploads">
<text name="title">
Obecne lokalizacje dla nowych plików

4
indra/newview/skins/default/xui/pl/panel_profile_pick.xml
View File

@ -18,8 +18,8 @@
Ładowanie...
</line_editor>
</layout_panel>
<layout_panel name="actions_lp">
<layout_stack name="actions_stack">
<layout_panel name="util_buttons_lp">
<layout_stack name="util_buttons_stack">
<layout_panel name="map_btn_lp">
<button name="show_on_map_btn" label="Pokaż na mapie" />
</layout_panel>

2
indra/newview/skins/default/xui/pl/panel_script_experience.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="script_experience" title="Przygoda">
<button name="Expand Experience" label="Przygoda" />
<check_box label="Używa przygody" name="enable_xp" />

4
indra/newview/skins/default/xui/pl/panel_sound_devices.xml
View File

@ -22,4 +22,8 @@
<text name="wait_text">
Proszę czekać
</text>
<text name="disabled_text">
Wyłączone
</text>
<button name="unmute_btn" label="Włącz" />
</panel>

8
indra/newview/skins/default/xui/pl/panel_tools_texture.xml
View File

@ -22,7 +22,7 @@
<text name="glow label">
Blask
</text>
<check_box label="Pełna jasność" name="checkbox fullbright" />
<check_box label="Superjasność" name="checkbox fullbright" />
<button name="copy_face_btn" tool_tip="Skopiuj parametry tekstury do schowka" />
<button name="paste_face_btn" tool_tip="Wklej parametry tekstury ze schowka" />
<text name="label_matmedia">
@ -78,14 +78,14 @@
<combo_box.item label="Beton" name="concrete" />
<combo_box.item label="Płytki/Kafelki" name="crustytile" />
<combo_box.item label="Kamień" name="cutstone" />
<combo_box.item label="Dysk CD" name="discs" />
<combo_box.item label="Dyski" name="discs" />
<combo_box.item label="Żwir" name="gravel" />
<combo_box.item label="Skamieliny" name="petridish" />
<combo_box.item label="Brzeg" name="siding" />
<combo_box.item label="Płytka kamienna" name="stonetile" />
<combo_box.item label="Stiuk (gips ozdobny)" name="stucco" />
<combo_box.item label="Ssawki" name="suction" />
<combo_box.item label="Fale" name="weave" />
<combo_box.item label="Splot" name="weave" />
<!-- <combo_box.item label="Użyj tekstury" name="Use texture" /> -->
</combo_box>
<texture_picker label="Tekstura" name="shinytexture control" tool_tip="Kliknij, aby wybrać obraz" />
@ -113,7 +113,7 @@
Wybrany URL mediów, jeśli jest obecny
</text>
<button name="add_media" tool_tip="Dodaj media" label="Wybierz..." />
<button name="delete_media" tool_tip="Usuń tą teksturę mediów" label="Usuń" />
<button name="delete_media" tool_tip="Usuń tę teksturę mediów" label="Usuń" />
<button label="Dopasuj" label_selected="Dopasuj Media" name="button align" tool_tip="Wyrównaj teksturę mediów (musi się najpierw załadować)" />
<text name="tex gen">
Mapowanie

2
indra/newview/skins/default/xui/pl/panel_topinfo_bar.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="topinfo_bar">
<text name="parcel_info_text" value="(ładowanie...)" />
</panel>

6
indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
View File

@ -50,10 +50,10 @@
</text>
</layout_panel>
<layout_panel name="layout_item_permissions_sale">
<text name="permissions_label">
<text name="perm_modify">
Zezwolenia
</text>
<text name="perm_modify">
<text name="you_perm_modify">
Możesz:
</text>
<check_box label="Modyfikacja" name="CheckOwnerModify" />
@ -74,7 +74,7 @@
<check_box label="Kopiowanie" name="CheckNextOwnerCopy" tool_tip="Następny właściciel może wykonać nieograniczoną liczbę kopii tego obiektu. Kopie przechowują informacje o twórcy i nigdy nie mogą mieć większych zezwoleń niż kopiowany element." />
<check_box label="Transferowanie" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddać lub sprzedać ten obiekt." />
<check_box label="Na sprzedaż" name="CheckPurchase" tool_tip="Pozwala ludziom kupować ten obiekt, jego zawartość lub kopię w świecie za określoną cenę." />
<combo_box name="ComboBoxSaleType" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiou, kopię samej zawartości przedmiou lub oryginalny przedmiot w ogóle.">
<combo_box name="ComboBoxSaleType" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiotu, kopię samej zawartości przedmiotu lub oryginalny przedmiot w ogóle.">
<combo_box.item name="Copy" label="Kopia" />
<combo_box.item name="Contents" label="Zawartość" />
<combo_box.item name="Original" label="Oryginał" />

2
indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
View File

@ -100,7 +100,7 @@
<check_box label="Transferowanie" name="checkbox next owner can transfer" tool_tip="Następny właściciel może sprzedać lub oddać ten obiekt." />
</panel>
<check_box label="Na sprzedaż" name="checkbox for sale" tool_tip="Pozwala ludziom kupować ten obiekt, jego zawartość lub kopię w świecie za określoną cenę." />
<combo_box name="sale type" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiou, kopię samej zawartości przedmiou lub oryginalny przedmiot w ogóle.">
<combo_box name="sale type" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiotu, kopię samej zawartości przedmiotu lub oryginalny przedmiot w ogóle.">
<combo_box.item label="Kopia" name="Copy"/>
<combo_box.item label="Zawartość" name="Contents"/>
<combo_box.item label="Oryginał" name="Original"/>

8
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -104,7 +104,7 @@ Wersja serwera głosu (Voice Server): [VOICE_VERSION]
Zmiana rozdzielczości...
</string>
<string name="Fullbright">
Pełna jasność
Superjasność
</string>
<string name="LoginInProgress">
Trwa logowanie. [APP_NAME] może wydawać się zawieszony. Proszę czekać.
@ -5086,6 +5086,12 @@ Raport o Nadużyciu
<string name="texture_load_dimensions_error">
Nie można załadować obrazów większych niż [WIDTH]*[HEIGHT]
</string>
<string name="texture_load_format_error">
Nieprawidłowy format obrazu.
</string>
<string name="texture_load_empty_file">
Plik jest pusty.
</string>
<string name="outfit_photo_load_dimensions_error">
Maks. rozmiar zdjęcia stroju to [WIDTH]*[HEIGHT]. Przeskaluj lub użyj innego.
</string>

2
indra/newview/skins/default/xui/pt/notifications.xml
View File

@ -3414,7 +3414,7 @@ Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; e
Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; em [TIME] segundos.
</notification>
<notification name="CannotUploadTexture">
Não foi possível carregar textura.
Não foi possível carregar textura: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

2
indra/newview/skins/default/xui/ru/floater_beacons.xml
View File

@ -20,7 +20,7 @@
<check_box label="Источники звука" name="sounds"/>
<check_box label="Источники частиц" name="particles"/>
<check_box label="Источники медиа" name="moapbeacon"/>
<text name="label_objects">
<text name="label_direction">
Показать направление на:
</text>
<check_box label="Солнце" name="sun"/>

2
indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
View File

@ -20,7 +20,7 @@
<stat_bar name="texture_cache_hits" label="Частота попадания в кэш"/>
<stat_bar name="texture_cache_read_latency" label="Задержка чтения кэша"/>
<stat_bar name="texture_decode_latency" label="Задержка декодирования кэша"/>
<stat_bar name="texture_decode_latency" label="Задержка записи в кэш"/>
<stat_bar name="texture_write_latency" label="Задержка записи в кэш"/>
<stat_bar name="texture_fetch_latency" label="Задержка выборки кэша"/>
<stat_bar name="texture_fetch_time" label="Время выборки кэша"/>
<stat_bar name="numimagesstat" label="Счетчик"/>

2
indra/newview/skins/default/xui/ru/floater_translation_settings.xml
View File

@ -49,7 +49,7 @@
<radio_item label="Переводчик Google" name="google"/>
<radio_item label="Переводчик DeepL" name="deepl"/>
</radio_group>
<text name="google_links_text">
<text name="azure_links_text">
[https://learn.microsoft.com/en-us/azure/cognitive-services/translator/create-translator-resource Установка]
</text>
<text name="azure_api_endoint_label">

2
indra/newview/skins/default/xui/ru/notifications.xml
View File

@ -3790,7 +3790,7 @@ https://wiki.firestormviewer.org/fs_voice
Вы локально обновили готовую текстуру [RESOLUTION] для &quot;[BODYREGION]&quot; через [TIME] сек.
</notification>
<notification name="CannotUploadTexture">
Невозможно загрузить текстуру.
Невозможно загрузить текстуру: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

4
indra/newview/skins/default/xui/ru/panel_profile_pick.xml
View File

@ -10,8 +10,8 @@
<text name="location_label">Локация:</text>
<line_editor name="pick_location">Загрузка...</line_editor>
</layout_panel>
<layout_panel name="actions_lp">
<layout_stack name="actions_stack">
<layout_panel name="util_buttons_lp">
<layout_stack name="util_buttons_stack">
<layout_panel name="map_btn_lp">
<button name="show_on_map_btn" label="На карте"/>
</layout_panel>

4
indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
View File

@ -57,10 +57,10 @@
</layout_panel>
<layout_panel name="layout_item_permissions_sale" >
<text name="permissions_label">
<text name="perm_modify">
Разрешения
</text>
<text name="perm_modify">
<text name="you_perm_modify">
Вы можете:
</text>
<check_box label="Изменять" name="CheckOwnerModify"/>

2
indra/newview/skins/default/xui/tr/notifications.xml
View File

@ -3524,7 +3524,7 @@ Sesli iletişim kullanılamayacak.
&apos;[BODYREGION]&apos; için [RESOLUTION] çözünürlükte kaydedilmiş bir dokuyu [TIME] saniye sonra yerel olarak güncellediniz.
</notification>
<notification name="CannotUploadTexture">
Doku karşıya yüklenemiyor.
Doku karşıya yüklenemiyor: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

2
indra/newview/skins/default/xui/zh/notifications.xml
View File

@ -3387,7 +3387,7 @@ SHA1 指紋：[MD5_DIGEST]
你在 [TIME] 秒鐘後在本地為 &apos;[BODYREGION]&apos; 更新了一個 [RESOLUTION] 的定貌材質。
</notification>
<notification name="CannotUploadTexture">
無法上傳質料。
無法上傳質料: &apos;[NAME]&apos;
[REASON]
</notification>
<notification name="LivePreviewUnavailable">

4
indra/newview/skins/starlight/xui/en/floater_tools.xml
View File

@ -3236,8 +3236,10 @@ Low ↔ Lwst
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
<panel
border="false"

4
indra/newview/skins/starlightcui/xui/en/floater_tools.xml
View File

@ -3236,8 +3236,10 @@ Low ↔ Lwst
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
<panel
border="false"

4
indra/newview/skins/vintage/xui/en/floater_tools.xml
View File

@ -3238,8 +3238,10 @@ Low ↔ Lwst
<panel
label="Texture"
help_topic="toolbox_texture_tab"
name="Texture"
name="Texture">
<!-- <FS:Zi> switchable edit texture/materials panel
filename="panel_tools_texture.xml">
-->
</panel>
<panel
border="false"