Merge branch brad/SL-19968-inventory-skel-background into 'origin/DRTVWR-559' (#489)

3 files changed, 8 insertions, 6 deletions

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index b99af1ae4c..778e5d3898 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1962,10 +1962,12 @@ public:
 void* LLWindowMacOSX::createSharedContext()
 {
     sharedContext* sc = new sharedContext();
-    CGLError err = CGLCreateContext(mPixelFormat, mContext, &(sc->mContext));
-    llassert(err == kCGLNoError);
-
-    CGLEnable(mContext, kCGLCEMPEngine);
+    CGLCreateContext(mPixelFormat, mContext, &(sc->mContext));
+    
+    if (sUseMultGL)
+    {
+        CGLEnable(mContext, kCGLCEMPEngine);
+    }
 
     return (void *)sc;
 }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 75c78d1ace..b9025ef7cd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9017,7 +9017,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
     <key>RenderPerformanceTest</key>
     <map>
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 3f4e3e804f..fe01996623 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -152,7 +152,7 @@
              top_pad="5"
              width="90">
                 <combo_box.item
-                 label="Blinn-Phong"
+                 label="Textures"
                  name="Materials"
                  value="Materials" />
                 <combo_box.item