livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-21787: Improve checks for LLEnableEditParticleSource to see if that helps

meow-7.2.2
Ansariel 2017-11-02 18:16:57 +01:00
parent f047beabc3
commit 0c317a9b97
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/llviewermenu.cpp
View File

@ -3027,18 +3027,29 @@ bool enable_derender_object()
class LLEnableEditParticleSource : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
if(LLSelectMgr::instance().getSelection()->getObjectCount()!=0)
bool handleEvent(const LLSD& userdata)
{
LLObjectSelectionHandle handle = LLSelectMgr::instance().getSelection();
if (handle->getObjectCount() >= 1)
{
LLObjectSelection::valid_iterator iter=LLSelectMgr::instance().getSelection()->valid_begin();
LLSelectNode* node=*iter;
if(!node || !node->mPermissions)
LLObjectSelection::valid_iterator iter = handle->valid_begin();
if (iter == handle->valid_end())
{
return false;
}
if(node->mPermissions->getOwner()==gAgent.getID())
LLSelectNode* node = *iter;
if (!node || !node->mPermissions)
{
return false;
}
if (node->mPermissions->getOwner() == gAgentID)
{
return true;
}
}
return false;
}
@ -3046,14 +3057,16 @@ class LLEnableEditParticleSource : public view_listener_t
class LLEditParticleSource : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
bool handleEvent(const LLSD& userdata)
{
LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (objectp)
{
ParticleEditor* particleEditor=LLFloaterReg::showTypedInstance<ParticleEditor>("particle_editor", LLSD(objectp->getID()), TAKE_FOCUS_YES);
if(particleEditor)
ParticleEditor* particleEditor = LLFloaterReg::showTypedInstance<ParticleEditor>("particle_editor", LLSD(objectp->getID()), TAKE_FOCUS_YES);
if (particleEditor)
{
particleEditor->setObject(objectp);
}
}
return true;
}