diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-18 18:10:59 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-18 18:10:59 +0100 |
| commit | 184ee74c39f5094283374e8aac714a6cd0fb4285 (patch) | |
| tree | b31b4e2f2815fb1db24b7a3767aa40e93cbf8269 | |
| parent | b9016effdf0c6f1e1748043eb061f8c4af911bfa (diff) | |
| parent | 2fe4b5169f5d8846b1c6cd4e2aaaf2f41a7b7629 (diff) | |
Merge
| -rw-r--r-- | indra/llrender/llgltexture.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/lltexture.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Settings.png | bin | 0 -> 925 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_SettingsDay.png | bin | 0 -> 925 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_SettingsSky.png | bin | 0 -> 883 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_SettingsWater.png | bin | 0 -> 764 bytes |
6 files changed, 2 insertions, 2 deletions
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 Binary files differnew file mode 100644 index 0000000000..c43ba349c4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Settings.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png Binary files differnew file mode 100644 index 0000000000..258ade1327 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png Binary files differnew file mode 100644 index 0000000000..77858b23c3 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png Binary files differnew file mode 100644 index 0000000000..46fb58c3f2 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png |
