diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index c0e5477cea..e9a39d8acb 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -408,4 +408,4 @@ void LLGLTexture::setTexelsPerImage() static LLUUID sStubUUID; -const LLUUID& LLGLTexture::getID() const { return sStubUUID; } \ No newline at end of file +const LLUUID& LLGLTexture::getID() const { return sStubUUID; } diff --git a/indra/llrender/lltexture.cpp b/indra/llrender/lltexture.cpp index 787a09a159..6eef36216c 100644 --- a/indra/llrender/lltexture.cpp +++ b/indra/llrender/lltexture.cpp @@ -40,4 +40,4 @@ S32 LLTexture::getWidth(S32 discard_level) const { llassert(false); return 0; } S32 LLTexture::getHeight(S32 discard_level) const { llassert(false); return 0; } bool LLTexture::isActiveFetching() { llassert(false); return false; } LLImageGL* LLTexture::getGLTexture() const { llassert(false); return nullptr; } -void LLTexture::updateBindStatsForTester() { } \ No newline at end of file +void LLTexture::updateBindStatsForTester() { } diff --git a/indra/newview/skins/default/textures/icons/Inv_Settings.png b/indra/newview/skins/default/textures/icons/Inv_Settings.png new file mode 100644 index 0000000000..c43ba349c4 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Settings.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png new file mode 100644 index 0000000000..258ade1327 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png new file mode 100644 index 0000000000..77858b23c3 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png new file mode 100644 index 0000000000..46fb58c3f2 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png differ