Merge

528ccdc9 · Graham Linden graham@lindenlab.com · 4129657c · 184ee74c · 528ccdc9 · 528ccdc9
Commit 528ccdc9 authored 7 years ago by Graham Linden graham@lindenlab.com
--- a/indra/llrender/llgltexture.cpp
+++ b/indra/llrender/llgltexture.cpp
--- a/indra/llrender/lltexture.cpp
+++ b/indra/llrender/lltexture.cpp
--- a/indra/newview/skins/default/textures/icons/Inv_Settings.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Settings.png
--- a/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png
--- a/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png
--- a/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png