More tab restoration.

Also fix ref to removed extra GLSL link module.

'warn-on-failure:no-tabs'
meow-7.2.2
Graham Linden 2019-03-12 11:07:23 -07:00
parent 15270f697a
commit 868cd32e5e
4 changed files with 4535 additions and 4543 deletions

View File

@ -401,11 +401,6 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
// work-around missing mix(vec3,vec3,bvec3)
mDefines["OLD_SELECT"] = "1";
#endif
if (mExtraLinkObject)
{
attachObject(mExtraLinkObject);
}
//compile new source
vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();

View File

@ -266,7 +266,7 @@ BOOL LLFloaterEditExtDayCycle::postBuild()
panel->setOnDirtyFlagChanged([this](LLPanel *, bool val) { onPanelDirtyFlagChanged(val); });
}
return TRUE;
return TRUE;
}
void LLFloaterEditExtDayCycle::onOpen(const LLSD& key)

View File

@ -1064,10 +1064,10 @@ LLSettingsDropTarget::LLSettingsDropTarget(const LLSettingsDropTarget::Params& p
{}
BOOL LLSettingsDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg)
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg)
{
BOOL handled = FALSE;

File diff suppressed because it is too large Load Diff