port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system

1 files changed, 8 insertions, 14 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index b2904b9..0fa8285 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -764,7 +764,7 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, BOOL undoab
         }
         else
         {
-                llerrs << "LLSelectMgr::add face " << face << " out-of-range" << llendl;
+                llwarns << "LLSelectMgr::add face " << face << " out-of-range" << llendl;
                 return;
         }
 
@@ -1187,7 +1187,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
                 }
                 else
                 {
-                        llerrs << "LLSelectMgr::remove - tried to remove TE " << te << " that wasn't selected" << llendl;
+                        llwarns << "LLSelectMgr::remove - tried to remove TE " << te << " that wasn't selected" << llendl;
                         return;
                 }
 
@@ -1210,7 +1210,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
         else
         {
                 // ...out of range face
-                llerrs << "LLSelectMgr::remove - TE " << te << " out of range" << llendl;
+                llwarns << "LLSelectMgr::remove - TE " << te << " out of range" << llendl;
         }
 
         updateSelectionCenter();
@@ -1709,7 +1709,7 @@ void LLSelectMgr::selectionSetFullbright(U8 fullbright)
         } sendfunc(fullbright);
         getSelection()->applyToObjects(&sendfunc);
 }
-
+/*
 void LLSelectMgr::selectionSetMediaTypeAndURL(U8 media_type, const std::string& media_url)
 {
         U8 media_flags = LLTextureEntry::MF_NONE;
@@ -1752,7 +1752,7 @@ void LLSelectMgr::selectionSetMediaTypeAndURL(U8 media_type, const std::string&
         } sendfunc(media_type, media_url);
         getSelection()->applyToObjects(&sendfunc);
 }
-
+*/
 void LLSelectMgr::selectionSetGlow(F32 glow)
 {
         struct f1 : public LLSelectedTEFunctor
@@ -3344,7 +3344,7 @@ void LLSelectMgr::packPermissionsHead(void* user_data)
 /*
 void LLSelectMgr::sendSelect()
 {
-        llerrs << "Not implemented" << llendl;
+        llwarns << "Not implemented" << llendl;
 }
 */
 
@@ -4156,7 +4156,7 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
                 break;
 
         default:
-                llerrs << "Bad send type " << send_type << " passed to SendListToRegions()" << llendl;
+                llwarns << "Bad send type " << send_type << " passed to SendListToRegions()" << llendl;
         }
 
         // bail if nothing selected
@@ -4563,11 +4563,6 @@ extern LLGLdouble	gGLModelView[16];
 
 void LLSelectMgr::updateSilhouettes()
 {
-        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
-        {
-                return;
-        }
-
         S32 num_sils_genned = 0;
 
         LLVector3d      cameraPos = gAgent.getCameraPositionGlobal();
@@ -5781,8 +5776,7 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
         }
 
         if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
-                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) ||
-                (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy()))
+                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()))
         {
                 // only select my own objects
                 return FALSE;