diff --git a/README.md b/README.md index 0943130420..e78a22fd54 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ Build instructions for each operating system can be found using the links below ## Contribute -Help make Firestorm better! You can get involved with improvements by filing bugs and suggesting enhancements via [JIRA](https://jira.firestormviewer.org) or [creating pull requests](FS_PR_GUIDELINES.md). +Help make Firestorm better! You can get involved with improvements by filing bugs and suggesting enhancements via [JIRA](https://jira.firestormviewer.org) or [creating pull requests](doc/FS_PR_GUIDELINES.md). diff --git a/FS_PR_GUIDELINES.md b/doc/FS_PR_GUIDELINES.md similarity index 100% rename from FS_PR_GUIDELINES.md rename to doc/FS_PR_GUIDELINES.md diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 8fcc4971e8..d9309a39c5 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -603,8 +603,6 @@ LLPanelFace::LLPanelFace() mTitleMediaText(NULL), mNeedMediaTitle(true) { - buildFromFile("panel_tools_texture.xml"); // switchable edit texture/materials - USE_TEXTURE = LLTrans::getString("use_texture"); // Extended copy & paste buttons //mCommitCallbackRegistrar.add("PanelFace.menuDoToSelected", boost::bind(&LLPanelFace::menuDoToSelected, this, _2)); @@ -612,8 +610,11 @@ LLPanelFace::LLPanelFace() // // Find all faces with same texture + mCommitCallbackRegistrar.add("BuildTool.Flip", boost::bind(&LLPanelFace::onCommitFlip, _1, _2)); mCommitCallbackRegistrar.add("BuildTool.SelectSameTexture", boost::bind(&LLPanelFace::onClickBtnSelectSameTexture, this, _1, _2)); // + + buildFromFile("panel_tools_texture.xml"); // switchable edit texture/materials } LLPanelFace::~LLPanelFace() diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 8331aa1471..d822925afb 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -950,13 +950,13 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag if (face && face->getViewerObject() && face->getTextureEntry()) { + F32 vsize = face->getPixelArea(); // Fix Blurry textures and use importance weight F32 radius; F32 cos_angle_to_view_dir; bool in_frustum = face->calcPixelArea(cos_angle_to_view_dir, radius); static LLCachedControl bias_unimportant_threshold(gSavedSettings, "TextureBiasUnimportantFactor", 0.25f); // - F32 vsize = face->getPixelArea(); // Scale desired texture resolution higher or lower depending on texture scale // diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index 17407720fa..d4ecea2c6e 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml @@ -70,7 +70,7 @@ - + Punkt. Beleucht. (Neustart erf.): diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 95d2cbe439..b4b8fc6113 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -421,7 +421,7 @@ layout="topleft" left_delta="-5" name="local lights_label" - tool_tip="Affects the number of rendered light sources when Advanced Lighting Model is disabled. A restart is required to change mode."> + tool_tip="Affects the number of rendered. A restart is required to change mode."> Point Lighting (restart required) +