Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
Brad Linden
commit
40197e8949
|
|
@ -18,9 +18,6 @@
|
|||
#include <algorithm>
|
||||
// std headers
|
||||
// external library headers
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include <boost/tokenizer.hpp>
|
||||
// other Linden headers
|
||||
#include "llerror.h"
|
||||
#include "llstring.h"
|
||||
|
|
@ -64,7 +61,9 @@ public:
|
|||
// Pass it a callback to our connect() method, so it can send events
|
||||
// from a particular LLEventPump to the plugin without having to know
|
||||
// this class or method name.
|
||||
mListener(new LLLeapListener(boost::bind(&LLLeapImpl::connect, this, _1, _2)))
|
||||
mListener(new LLLeapListener(
|
||||
[this](LLEventPump& pump, const std::string& listener)
|
||||
{ return connect(pump, listener); }))
|
||||
{
|
||||
// Rule out unpopulated Params block
|
||||
if (! cparams.executable.isProvided())
|
||||
|
|
@ -93,7 +92,7 @@ public:
|
|||
}
|
||||
|
||||
// Listen for child "termination" right away to catch launch errors.
|
||||
mDonePump.listen("LLLeap", boost::bind(&LLLeapImpl::bad_launch, this, _1));
|
||||
mDonePump.listen("LLLeap", [this](const LLSD& data){ return bad_launch(data); });
|
||||
|
||||
// Okay, launch child.
|
||||
// Get a modifiable copy of params block to set files and postend.
|
||||
|
|
@ -113,7 +112,7 @@ public:
|
|||
|
||||
// Okay, launch apparently worked. Change our mDonePump listener.
|
||||
mDonePump.stopListening("LLLeap");
|
||||
mDonePump.listen("LLLeap", boost::bind(&LLLeapImpl::done, this, _1));
|
||||
mDonePump.listen("LLLeap", [this](const LLSD& data){ return done(data); });
|
||||
|
||||
// Child might pump large volumes of data through either stdout or
|
||||
// stderr. Don't bother copying all that data into notification event.
|
||||
|
|
@ -128,13 +127,9 @@ public:
|
|||
|
||||
// Listening on stdout is stateful. In general, we're either waiting
|
||||
// for the length prefix or waiting for the specified length of data.
|
||||
// We address that with two different listener methods -- one of which
|
||||
// is blocked at any given time.
|
||||
mReadPrefix = true;
|
||||
mStdoutConnection = childout.getPump()
|
||||
.listen("prefix", boost::bind(&LLLeapImpl::rstdout, this, _1));
|
||||
mStdoutDataConnection = childout.getPump()
|
||||
.listen("data", boost::bind(&LLLeapImpl::rstdoutData, this, _1));
|
||||
mBlocker.reset(new LLEventPump::Blocker(mStdoutDataConnection));
|
||||
.listen("LLLeap", [this](const LLSD& data){ return rstdout(data); });
|
||||
|
||||
// Log anything sent up through stderr. When a typical program
|
||||
// encounters an error, it writes its error message to stderr and
|
||||
|
|
@ -142,7 +137,7 @@ public:
|
|||
// interpreter behaves that way. More generally, though, a plugin
|
||||
// author can log whatever s/he wants to the viewer log using stderr.
|
||||
mStderrConnection = childerr.getPump()
|
||||
.listen("LLLeap", boost::bind(&LLLeapImpl::rstderr, this, _1));
|
||||
.listen("LLLeap", [this](const LLSD& data){ return rstderr(data); });
|
||||
|
||||
// For our lifespan, intercept any LL_ERRS so we can notify plugin
|
||||
mRecorder = LLError::addGenericRecorder(
|
||||
|
|
@ -255,120 +250,120 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
// Initial state of stateful listening on child stdout: wait for a length
|
||||
// prefix, followed by ':'.
|
||||
bool rstdout(const LLSD& data)
|
||||
// Stateful listening on child stdout:
|
||||
// wait for a length prefix, followed by ':'.
|
||||
bool rstdout(const LLSD&)
|
||||
{
|
||||
LLProcess::ReadPipe& childout(mChild->getReadPipe(LLProcess::STDOUT));
|
||||
// It's possible we got notified of a couple digit characters without
|
||||
// seeing the ':' -- unlikely, but still. Until we see ':', keep
|
||||
// waiting.
|
||||
if (childout.contains(':'))
|
||||
while (childout.size())
|
||||
{
|
||||
std::istream& childstream(childout.get_istream());
|
||||
// Saw ':', read length prefix and store in mExpect.
|
||||
size_t expect;
|
||||
childstream >> expect;
|
||||
int colon(childstream.get());
|
||||
if (colon != ':')
|
||||
/*----------------- waiting for length prefix ------------------*/
|
||||
if (mReadPrefix)
|
||||
{
|
||||
// Protocol failure. Clear out the rest of the pending data in
|
||||
// childout (well, up to a max length) to log what was wrong.
|
||||
LLProcess::ReadPipe::size_type
|
||||
readlen((std::min)(childout.size(), LLProcess::ReadPipe::size_type(80)));
|
||||
bad_protocol(STRINGIZE(expect << char(colon) << childout.read(readlen)));
|
||||
}
|
||||
else
|
||||
{
|
||||
// Saw length prefix, saw colon, life is good. Now wait for
|
||||
// that length of data to arrive.
|
||||
mExpect = expect;
|
||||
LL_DEBUGS("LLLeap") << "got length, waiting for "
|
||||
<< mExpect << " bytes of data" << LL_ENDL;
|
||||
// Block calls to this method; resetting mBlocker unblocks
|
||||
// calls to the other method.
|
||||
mBlocker.reset(new LLEventPump::Blocker(mStdoutConnection));
|
||||
// Go check if we've already received all the advertised data.
|
||||
if (childout.size())
|
||||
// It's possible we got notified of a couple digit characters without
|
||||
// seeing the ':' -- unlikely, but still. Until we see ':', keep
|
||||
// waiting.
|
||||
if (! childout.contains(':'))
|
||||
{
|
||||
LLSD updata(data);
|
||||
updata["len"] = LLSD::Integer(childout.size());
|
||||
rstdoutData(updata);
|
||||
if (childout.contains('\n'))
|
||||
{
|
||||
// Since this is the initial listening state, this is where we'd
|
||||
// arrive if the child isn't following protocol at all -- say
|
||||
// because the user specified 'ls' or some darn thing.
|
||||
bad_protocol(childout.getline());
|
||||
}
|
||||
// Either way, stop looping.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (childout.contains('\n'))
|
||||
{
|
||||
// Since this is the initial listening state, this is where we'd
|
||||
// arrive if the child isn't following protocol at all -- say
|
||||
// because the user specified 'ls' or some darn thing.
|
||||
bad_protocol(childout.getline());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// State in which we listen on stdout for the specified length of data to
|
||||
// arrive.
|
||||
bool rstdoutData(const LLSD& data)
|
||||
{
|
||||
LLProcess::ReadPipe& childout(mChild->getReadPipe(LLProcess::STDOUT));
|
||||
// Until we've accumulated the promised length of data, keep waiting.
|
||||
if (childout.size() >= mExpect)
|
||||
{
|
||||
// Ready to rock and roll.
|
||||
LL_DEBUGS("LLLeap") << "needed " << mExpect << " bytes, got "
|
||||
<< childout.size() << ", parsing LLSD" << LL_ENDL;
|
||||
LLSD data;
|
||||
#if 1
|
||||
// specifically require notation LLSD from child
|
||||
LLPointer<LLSDParser> parser(new LLSDNotationParser());
|
||||
S32 parse_status(parser->parse(childout.get_istream(), data, mExpect));
|
||||
if (parse_status == LLSDParser::PARSE_FAILURE)
|
||||
#else
|
||||
// SL-18330: accept any valid LLSD serialization format from child
|
||||
// Unfortunately this runs into trouble we have not yet debugged.
|
||||
bool parse_status(LLSDSerialize::deserialize(data, childout.get_istream(), mExpect));
|
||||
if (! parse_status)
|
||||
#endif
|
||||
{
|
||||
bad_protocol("unparseable LLSD data");
|
||||
}
|
||||
else if (! (data.isMap() && data["pump"].isString() && data.has("data")))
|
||||
{
|
||||
// we got an LLSD object, but it lacks required keys
|
||||
bad_protocol("missing 'pump' or 'data'");
|
||||
// Saw ':', read length prefix and store in mExpect.
|
||||
std::istream& childstream(childout.get_istream());
|
||||
size_t expect;
|
||||
childstream >> expect;
|
||||
int colon(childstream.get());
|
||||
if (colon != ':')
|
||||
{
|
||||
// Protocol failure. Clear out the rest of the pending data in
|
||||
// childout (well, up to a max length) to log what was wrong.
|
||||
LLProcess::ReadPipe::size_type
|
||||
readlen((std::min)(childout.size(),
|
||||
LLProcess::ReadPipe::size_type(80)));
|
||||
bad_protocol(stringize(expect, char(colon), childout.read(readlen)));
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Saw length prefix, saw colon, life is good. Now wait for
|
||||
// that length of data to arrive.
|
||||
mExpect = expect;
|
||||
LL_DEBUGS("LLLeap") << "got length, waiting for "
|
||||
<< mExpect << " bytes of data" << LL_ENDL;
|
||||
// Transition to "read data" mode and loop back to check
|
||||
// if we've already received all the advertised data.
|
||||
mReadPrefix = false;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
/*----------------- saw prefix, wait for data ------------------*/
|
||||
else
|
||||
{
|
||||
try
|
||||
// Until we've accumulated the promised length of data, keep waiting.
|
||||
if (childout.size() < mExpect)
|
||||
{
|
||||
// The LLSD object we got from our stream contains the
|
||||
// keys we need.
|
||||
LLEventPumps::instance().obtain(data["pump"]).post(data["data"]);
|
||||
break;
|
||||
}
|
||||
catch (const std::exception& err)
|
||||
|
||||
// We have the data we were told to expect! Ready to rock and roll.
|
||||
LL_DEBUGS("LLLeap") << "needed " << mExpect << " bytes, got "
|
||||
<< childout.size() << ", parsing LLSD" << LL_ENDL;
|
||||
LLSD data;
|
||||
#if 1
|
||||
// specifically require notation LLSD from child
|
||||
LLPointer<LLSDParser> parser(new LLSDNotationParser());
|
||||
S32 parse_status(parser->parse(childout.get_istream(), data, mExpect));
|
||||
if (parse_status == LLSDParser::PARSE_FAILURE)
|
||||
#else
|
||||
// SL-18330: accept any valid LLSD serialization format from child
|
||||
// Unfortunately this runs into trouble we have not yet debugged.
|
||||
bool parse_status(LLSDSerialize::deserialize(data, childout.get_istream(), mExpect));
|
||||
if (! parse_status)
|
||||
#endif
|
||||
{
|
||||
// No plugin should be allowed to crash the viewer by
|
||||
// driving an exception -- intentionally or not.
|
||||
LOG_UNHANDLED_EXCEPTION(stringize("handling request ", data));
|
||||
// Whether or not the plugin added a "reply" key to the
|
||||
// request, send a reply. We happen to know who originated
|
||||
// this request, and the reply LLEventPump of interest.
|
||||
// Not our problem if the plugin ignores the reply event.
|
||||
data["reply"] = mReplyPump.getName();
|
||||
sendReply(llsd::map("error",
|
||||
stringize(LLError::Log::classname(err), ": ", err.what())),
|
||||
data);
|
||||
bad_protocol("unparseable LLSD data");
|
||||
break;
|
||||
}
|
||||
// Block calls to this method; resetting mBlocker unblocks
|
||||
// calls to the other method.
|
||||
mBlocker.reset(new LLEventPump::Blocker(mStdoutDataConnection));
|
||||
// Go check for any more pending events in the buffer.
|
||||
if (childout.size())
|
||||
else if (! (data.isMap() && data["pump"].isString() && data.has("data")))
|
||||
{
|
||||
LLSD updata(data);
|
||||
data["len"] = LLSD::Integer(childout.size());
|
||||
rstdout(updata);
|
||||
// we got an LLSD object, but it lacks required keys
|
||||
bad_protocol("missing 'pump' or 'data'");
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
// The LLSD object we got from our stream contains the
|
||||
// keys we need.
|
||||
LLEventPumps::instance().obtain(data["pump"]).post(data["data"]);
|
||||
}
|
||||
catch (const std::exception& err)
|
||||
{
|
||||
// No plugin should be allowed to crash the viewer by
|
||||
// driving an exception -- intentionally or not.
|
||||
LOG_UNHANDLED_EXCEPTION(stringize("handling request ", data));
|
||||
// Whether or not the plugin added a "reply" key to the
|
||||
// request, send a reply. We happen to know who originated
|
||||
// this request, and the reply LLEventPump of interest.
|
||||
// Not our problem if the plugin ignores the reply event.
|
||||
data["reply"] = mReplyPump.getName();
|
||||
sendReply(llsd::map("error",
|
||||
stringize(LLError::Log::classname(err), ": ", err.what())),
|
||||
data);
|
||||
}
|
||||
// Transition to "read prefix" mode and go check for any
|
||||
// more pending events in the buffer.
|
||||
mReadPrefix = true;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -453,7 +448,8 @@ private:
|
|||
// child's stdin, suitably enriched with the pump name on which it was
|
||||
// received.
|
||||
return pump.listen(listener,
|
||||
boost::bind(&LLLeapImpl::wstdin, this, pump.getName(), _1));
|
||||
[this, name=pump.getName()](const LLSD& data)
|
||||
{ return wstdin(name, data); });
|
||||
}
|
||||
|
||||
std::string mDesc;
|
||||
|
|
@ -461,11 +457,11 @@ private:
|
|||
LLEventStream mReplyPump;
|
||||
LLProcessPtr mChild;
|
||||
LLTempBoundListener
|
||||
mStdinConnection, mStdoutConnection, mStdoutDataConnection, mStderrConnection;
|
||||
std::unique_ptr<LLEventPump::Blocker> mBlocker;
|
||||
mStdinConnection, mStdoutConnection, mStderrConnection;
|
||||
LLProcess::ReadPipe::size_type mExpect;
|
||||
LLError::RecorderPtr mRecorder;
|
||||
std::unique_ptr<LLLeapListener> mListener;
|
||||
bool mReadPrefix;
|
||||
};
|
||||
|
||||
// These must follow the declaration of LLLeapImpl, so they may as well be last.
|
||||
|
|
|
|||
|
|
@ -1237,27 +1237,35 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
|
|||
|
||||
// Texture
|
||||
{
|
||||
mIsAlpha = false;
|
||||
LLGLenum image_format = GL_RGB;
|
||||
bool identical_image_format = false;
|
||||
LLSelectedTE::getImageFormat(image_format, identical_image_format);
|
||||
bool missing_asset = false;
|
||||
LLSelectedTE::getImageFormat(image_format, identical_image_format, missing_asset);
|
||||
|
||||
mIsAlpha = false;
|
||||
switch (image_format)
|
||||
if (!missing_asset)
|
||||
{
|
||||
mIsAlpha = false;
|
||||
switch (image_format)
|
||||
{
|
||||
case GL_RGBA:
|
||||
case GL_ALPHA:
|
||||
{
|
||||
mIsAlpha = true;
|
||||
}
|
||||
break;
|
||||
{
|
||||
mIsAlpha = true;
|
||||
}
|
||||
break;
|
||||
|
||||
case GL_RGB: break;
|
||||
default:
|
||||
{
|
||||
LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
|
||||
{
|
||||
LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Don't know image's properties, use material's mode value
|
||||
mIsAlpha = true;
|
||||
}
|
||||
|
||||
if (LLViewerMedia::getInstance()->textureHasMedia(id))
|
||||
|
|
@ -1303,10 +1311,12 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
|
|||
texture_ctrl->setTentative(false);
|
||||
texture_ctrl->setEnabled(editable && !has_pbr_material);
|
||||
texture_ctrl->setImageAssetID(id);
|
||||
getChildView("combobox alphamode")->setEnabled(editable && mIsAlpha && transparency <= 0.f && !has_pbr_material);
|
||||
getChildView("label alphamode")->setEnabled(editable && mIsAlpha && !has_pbr_material);
|
||||
getChildView("maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
|
||||
getChildView("label maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
|
||||
|
||||
bool can_change_alpha = editable && mIsAlpha && !missing_asset && !has_pbr_material;
|
||||
getChildView("combobox alphamode")->setEnabled(can_change_alpha && transparency <= 0.f);
|
||||
getChildView("label alphamode")->setEnabled(can_change_alpha);
|
||||
getChildView("maskcutoff")->setEnabled(can_change_alpha);
|
||||
getChildView("label maskcutoff")->setEnabled(can_change_alpha);
|
||||
|
||||
texture_ctrl->setBakeTextureEnabled(true);
|
||||
}
|
||||
|
|
@ -1329,10 +1339,12 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
|
|||
texture_ctrl->setTentative(true);
|
||||
texture_ctrl->setEnabled(editable && !has_pbr_material);
|
||||
texture_ctrl->setImageAssetID(id);
|
||||
getChildView("combobox alphamode")->setEnabled(editable && mIsAlpha && transparency <= 0.f && !has_pbr_material);
|
||||
getChildView("label alphamode")->setEnabled(editable && mIsAlpha && !has_pbr_material);
|
||||
getChildView("maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
|
||||
getChildView("label maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
|
||||
|
||||
bool can_change_alpha = editable && mIsAlpha && !missing_asset && !has_pbr_material;
|
||||
getChildView("combobox alphamode")->setEnabled(can_change_alpha && transparency <= 0.f);
|
||||
getChildView("label alphamode")->setEnabled(can_change_alpha);
|
||||
getChildView("maskcutoff")->setEnabled(can_change_alpha);
|
||||
getChildView("label maskcutoff")->setEnabled(can_change_alpha);
|
||||
|
||||
texture_ctrl->setBakeTextureEnabled(true);
|
||||
}
|
||||
|
|
@ -3322,13 +3334,14 @@ void LLPanelFace::onSelectTexture(const LLSD& data)
|
|||
|
||||
LLGLenum image_format;
|
||||
bool identical_image_format = false;
|
||||
LLSelectedTE::getImageFormat(image_format, identical_image_format);
|
||||
bool missing_asset = false;
|
||||
LLSelectedTE::getImageFormat(image_format, identical_image_format, missing_asset);
|
||||
|
||||
LLCtrlSelectionInterface* combobox_alphamode =
|
||||
childGetSelectionInterface("combobox alphamode");
|
||||
|
||||
U32 alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
|
||||
if (combobox_alphamode)
|
||||
if (combobox_alphamode && !missing_asset)
|
||||
{
|
||||
switch (image_format)
|
||||
{
|
||||
|
|
@ -5228,19 +5241,51 @@ void LLPanelFace::LLSelectedTE::getFace(LLFace*& face_to_return, bool& identical
|
|||
identical_face = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_te_face_func, face_to_return, false, (LLFace*)nullptr);
|
||||
}
|
||||
|
||||
void LLPanelFace::LLSelectedTE::getImageFormat(LLGLenum& image_format_to_return, bool& identical_face)
|
||||
void LLPanelFace::LLSelectedTE::getImageFormat(LLGLenum& image_format_to_return, bool& identical_face, bool& missing_asset)
|
||||
{
|
||||
LLGLenum image_format;
|
||||
struct LLSelectedTEGetImageFormat : public LLSelectedTEGetFunctor<LLGLenum>
|
||||
struct LLSelectedTEGetmatId : public LLSelectedTEFunctor
|
||||
{
|
||||
LLGLenum get(LLViewerObject* object, S32 te_index)
|
||||
LLSelectedTEGetmatId()
|
||||
: mImageFormat(GL_RGB)
|
||||
, mIdentical(true)
|
||||
, mMissingAsset(false)
|
||||
, mFirstRun(true)
|
||||
{
|
||||
LLViewerTexture* image = object->getTEImage(te_index);
|
||||
return image ? image->getPrimaryFormat() : GL_RGB;
|
||||
}
|
||||
} get_glenum;
|
||||
identical_face = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_glenum, image_format);
|
||||
image_format_to_return = image_format;
|
||||
bool apply(LLViewerObject* object, S32 te_index) override
|
||||
{
|
||||
LLViewerTexture* image = object ? object->getTEImage(te_index) : nullptr;
|
||||
LLGLenum format = GL_RGB;
|
||||
bool missing = false;
|
||||
if (image)
|
||||
{
|
||||
format = image->getPrimaryFormat();
|
||||
missing = image->isMissingAsset();
|
||||
}
|
||||
|
||||
if (mFirstRun)
|
||||
{
|
||||
mFirstRun = false;
|
||||
mImageFormat = format;
|
||||
mMissingAsset = missing;
|
||||
}
|
||||
else
|
||||
{
|
||||
mIdentical &= (mImageFormat == format);
|
||||
mIdentical &= (mMissingAsset == missing);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
LLGLenum mImageFormat;
|
||||
bool mIdentical;
|
||||
bool mMissingAsset;
|
||||
bool mFirstRun;
|
||||
} func;
|
||||
LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
|
||||
|
||||
image_format_to_return = func.mImageFormat;
|
||||
identical_face = func.mIdentical;
|
||||
missing_asset = func.mMissingAsset;
|
||||
}
|
||||
|
||||
void LLPanelFace::LLSelectedTE::getTexId(LLUUID& id, bool& identical)
|
||||
|
|
|
|||
|
|
@ -600,7 +600,7 @@ public:
|
|||
{
|
||||
public:
|
||||
static void getFace(class LLFace*& face_to_return, bool& identical_face);
|
||||
static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
|
||||
static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face, bool& missing_asset);
|
||||
static void getTexId(LLUUID& id, bool& identical);
|
||||
static void getPbrMaterialId(LLUUID& id, bool& identical, bool& has_pbr, bool& has_faces_without_pbr);
|
||||
static void getObjectScaleS(F32& scale_s, bool& identical);
|
||||
|
|
|
|||
Loading…
Reference in New Issue