SL-18448 When initing views and object has pbr, open pbr in texture tab

2 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index f09d1abe2d..c71d466830 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -283,6 +283,11 @@ void LLDrawPoolWLSky::renderStars(const LLVector3& camPosLocal) const
 
 void LLDrawPoolWLSky::renderStarsDeferred(const LLVector3& camPosLocal) const
 {
+    if (!gSky.mVOSkyp)
+    {
+        return;
+    }
+
 	LLGLSPipelineBlendSkyBox gls_sky(true, false);
 
 	gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 92e92ac6a6..8848accab0 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -996,8 +996,18 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		
         if (mComboMatMedia->getCurrentIndex() < MATMEDIA_MATERIAL)
         {
-            mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
+            // When selecting an object with a pbr and UI combo is not set,
+            // set to pbr option, otherwise to a texture (material)
+            if (has_pbr_material)
+            {
+                mComboMatMedia->selectNthItem(MATMEDIA_PBR);
+            }
+            else
+            {
+                mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
+            }
         }
+
         mComboMatMedia->setEnabled(editable);
 
 		LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");