Merged in lindenlab/viewer-lynx

Fri, 26 Feb 2016 21:44:30 +0200

author
AndreyL ProductEngine <alihatskiy@productengine.com>
date
Fri, 26 Feb 2016 21:44:30 +0200
changeset 48898
b4de46ad34b2
parent 48890
443d38083c23
parent 48897
6eda2cd4ecc3
child 48899
c85f952a50b6
child 48904
de1ee5d38324

Merged in lindenlab/viewer-lynx

     1.1 --- a/indra/newview/llfloatermodelpreview.cpp	Wed Feb 24 16:22:38 2016 +0200
     1.2 +++ b/indra/newview/llfloatermodelpreview.cpp	Fri Feb 26 21:44:30 2016 +0200
     1.3 @@ -1550,9 +1550,18 @@
     1.4  					}
     1.5  					instance.mLOD[i] = lod_model;
     1.6  				}
     1.7 -				else if (importerDebug)
     1.8 +				else
     1.9  				{
    1.10 -					LL_INFOS() << "List of models does not include " << instance.mLabel << LL_ENDL;
    1.11 +					if (i < LLModel::LOD_HIGH && !lodsReady())
    1.12 +					{
    1.13 +						// assign a placeholder from previous LOD until lod generation is complete.
    1.14 +						// Note: we might need to assign it regardless of conditions like named search does, to prevent crashes.
    1.15 +						instance.mLOD[i] = instance.mLOD[i + 1];
    1.16 +					}
    1.17 +					if (importerDebug)
    1.18 +					{
    1.19 +						LL_INFOS() << "List of models does not include " << instance.mLabel << LL_ENDL;
    1.20 +					}
    1.21  				}
    1.22  			}
    1.23  
     2.1 --- a/indra/newview/llpanelpermissions.cpp	Wed Feb 24 16:22:38 2016 +0200
     2.2 +++ b/indra/newview/llpanelpermissions.cpp	Fri Feb 26 21:44:30 2016 +0200
     2.3 @@ -571,69 +571,60 @@
     2.4  	U32 next_owner_mask_on 		= 0;
     2.5  	U32 next_owner_mask_off		= 0;
     2.6  
     2.7 -	BOOL valid_base_perms = FALSE;
     2.8 -	BOOL valid_group_perms= FALSE;
     2.9 -	BOOL valid_everyone_perms= FALSE;
    2.10 -	BOOL valid_next_perms= FALSE;
    2.11 -
    2.12 -	if(root_selected)
    2.13 -	{
    2.14 -	    valid_base_perms 		= LLSelectMgr::getInstance()->selectGetPerm(PERM_BASE,
    2.15 +	BOOL valid_base_perms 		= LLSelectMgr::getInstance()->selectGetPerm(PERM_BASE,
    2.16  																			&base_mask_on,
    2.17  																			&base_mask_off);
    2.18 -	    //BOOL valid_owner_perms =//
    2.19 -	    LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
    2.20 +	//BOOL valid_owner_perms =//
    2.21 +	LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
    2.22  											  &owner_mask_on,
    2.23  											  &owner_mask_off);
    2.24 -	    valid_group_perms 		= LLSelectMgr::getInstance()->selectGetPerm(PERM_GROUP,
    2.25 +	BOOL valid_group_perms 		= LLSelectMgr::getInstance()->selectGetPerm(PERM_GROUP,
    2.26  																			&group_mask_on,
    2.27  																			&group_mask_off);
    2.28  	
    2.29 -	    valid_everyone_perms 	= LLSelectMgr::getInstance()->selectGetPerm(PERM_EVERYONE,
    2.30 +	BOOL valid_everyone_perms 	= LLSelectMgr::getInstance()->selectGetPerm(PERM_EVERYONE,
    2.31  																			&everyone_mask_on,
    2.32  																			&everyone_mask_off);
    2.33  	
    2.34 -	    valid_next_perms 		= LLSelectMgr::getInstance()->selectGetPerm(PERM_NEXT_OWNER,
    2.35 +	BOOL valid_next_perms 		= LLSelectMgr::getInstance()->selectGetPerm(PERM_NEXT_OWNER,
    2.36  																			&next_owner_mask_on,
    2.37  																			&next_owner_mask_off);
    2.38 -	}
    2.39 -	else
    2.40 -	{
    2.41 -	    if(object_count == 1)
    2.42 -	    {
    2.43 -	        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
    2.44 -	        if (node && node->mValid)
    2.45 -	        {
    2.46 -	            valid_base_perms = TRUE;
    2.47  
    2.48 -	            base_mask_on = node->mPermissions->getMaskBase();
    2.49 -	            owner_mask_on = node->mPermissions->getMaskOwner();
    2.50 -	            group_mask_on = node->mPermissions->getMaskGroup();
    2.51 -	            everyone_mask_on = node->mPermissions->getMaskEveryone();
    2.52 -	            next_owner_mask_on = node->mPermissions->getMaskNextOwner();
    2.53 -	        }
    2.54 -	    }
    2.55 -	}
    2.56  
    2.57 -	
    2.58  	if (gSavedSettings.getBOOL("DebugPermissions") )
    2.59  	{
    2.60  		if (valid_base_perms)
    2.61  		{
    2.62  			getChild<LLUICtrl>("B:")->setValue("B: " + mask_to_string(base_mask_on));
    2.63 -			getChildView("B:")->setVisible(							TRUE);
    2.64 -			
    2.65 +			getChildView("B:")->setVisible(TRUE);
    2.66  			getChild<LLUICtrl>("O:")->setValue("O: " + mask_to_string(owner_mask_on));
    2.67 -			getChildView("O:")->setVisible(							TRUE);
    2.68 -			
    2.69 +			getChildView("O:")->setVisible(TRUE);
    2.70  			getChild<LLUICtrl>("G:")->setValue("G: " + mask_to_string(group_mask_on));
    2.71 -			getChildView("G:")->setVisible(							TRUE);
    2.72 -			
    2.73 +			getChildView("G:")->setVisible(TRUE);
    2.74  			getChild<LLUICtrl>("E:")->setValue("E: " + mask_to_string(everyone_mask_on));
    2.75 -			getChildView("E:")->setVisible(							TRUE);
    2.76 -			
    2.77 +			getChildView("E:")->setVisible(TRUE);
    2.78  			getChild<LLUICtrl>("N:")->setValue("N: " + mask_to_string(next_owner_mask_on));
    2.79 -			getChildView("N:")->setVisible(							TRUE);
    2.80 +			getChildView("N:")->setVisible(TRUE);
    2.81 +		}
    2.82 +		else if(!root_selected)
    2.83 +		{
    2.84 +			if(object_count == 1)
    2.85 +			{
    2.86 +				LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
    2.87 +				if (node && node->mValid)
    2.88 +				{
    2.89 +					getChild<LLUICtrl>("B:")->setValue("B: " + mask_to_string( node->mPermissions->getMaskBase()));
    2.90 +					getChildView("B:")->setVisible(TRUE);
    2.91 +					getChild<LLUICtrl>("O:")->setValue("O: " + mask_to_string(node->mPermissions->getMaskOwner()));
    2.92 +					getChildView("O:")->setVisible(TRUE);
    2.93 +					getChild<LLUICtrl>("G:")->setValue("G: " + mask_to_string(node->mPermissions->getMaskGroup()));
    2.94 +					getChildView("G:")->setVisible(TRUE);
    2.95 +					getChild<LLUICtrl>("E:")->setValue("E: " + mask_to_string(node->mPermissions->getMaskEveryone()));
    2.96 +					getChildView("E:")->setVisible(TRUE);
    2.97 +					getChild<LLUICtrl>("N:")->setValue("N: " + mask_to_string(node->mPermissions->getMaskNextOwner()));
    2.98 +					getChildView("N:")->setVisible(TRUE);
    2.99 +				}
   2.100 +			}
   2.101  		}
   2.102  		else
   2.103  		{
     3.1 --- a/indra/newview/llviewertexture.h	Wed Feb 24 16:22:38 2016 +0200
     3.2 +++ b/indra/newview/llviewertexture.h	Fri Feb 26 21:44:30 2016 +0200
     3.3 @@ -661,7 +661,7 @@
     3.4  	static LLViewerFetchedTexture* getFetchedTextureFromFile(const std::string& filename,									 
     3.5  									 FTType f_type = FTT_LOCAL_FILE,
     3.6  									 BOOL usemipmap = TRUE,
     3.7 -									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,
     3.8 +									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
     3.9  									 S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
    3.10  									 LLGLint internal_format = 0,
    3.11  									 LLGLenum primary_format = 0,
     4.1 --- a/indra/newview/pipeline.cpp	Wed Feb 24 16:22:38 2016 +0200
     4.2 +++ b/indra/newview/pipeline.cpp	Fri Feb 26 21:44:30 2016 +0200
     4.3 @@ -8661,6 +8661,11 @@
     4.4  						}
     4.5  					}
     4.6  
     4.7 +					const LLViewerObject *vobj = drawablep->getVObj();
     4.8 +					if(vobj && vobj->getAvatar() && vobj->getAvatar()->isInMuteList())
     4.9 +					{
    4.10 +						continue;
    4.11 +					}
    4.12  
    4.13  					LLVector4a center;
    4.14  					center.load3(drawablep->getPositionAgent().mV);

mercurial