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

FIRE-10125: Textures can be dragged into sculpt texture picker for meshes

Ansariel 2014-01-28 12:13:24 +01:00
parent 2d8ec87d94
commit e91b232f11
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llpanelobject.cpp
View File

@ -301,6 +301,8 @@ BOOL LLPanelObject::postBuild()
mCtrlSculptTexture->setOnCancelCallback( boost::bind(&LLPanelObject::onCancelSculpt, this, _2 ));
mCtrlSculptTexture->setOnSelectCallback( boost::bind(&LLPanelObject::onSelectSculpt, this, _2 ));
mCtrlSculptTexture->setDropCallback( boost::bind(&LLPanelObject::onDropSculpt, this, _2 ));
// <FS:Ansariel> FIRE-10125: Textures can be dragged into sculpt texture picker for meshes
mCtrlSculptTexture->setDragCallback( boost::bind(&LLPanelObject::onDragSculpt, this));
// Don't allow (no copy) or (no transfer) textures to be selected during immediate mode
mCtrlSculptTexture->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
mCtrlSculptTexture->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
@ -623,6 +625,10 @@ void LLPanelObject::getState( )
// BUG? Check for all objects being editable?
S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
BOOL editable = root_objectp->permModify();
// <FS:Ansariel> FIRE-10125: Textures can be dragged into sculpt texture picker for meshes
mIsEditable = editable;
mIsMesh = false;
// </FS:Ansariel>
// Select Single Message
// <FS:Ansariel> We don't have those in FS (2013-04-28)
@ -1358,6 +1364,8 @@ void LLPanelObject::getState( )
BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
isMesh = (sculpt_stitching == LL_SCULPT_TYPE_MESH);
// <FS:Ansariel> FIRE-10125: Textures can be dragged into sculpt texture picker for meshes
mIsMesh = isMesh;
LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
if(mTextureCtrl)
@ -2400,6 +2408,12 @@ BOOL LLPanelObject::onDropSculpt(LLInventoryItem* item)
return TRUE;
}
// <FS:Ansariel> FIRE-10125: Textures can be dragged into sculpt texture picker for meshes
BOOL LLPanelObject::onDragSculpt()
{
return (mIsEditable && !mIsMesh);
}
// </FS:Ansariel>
void LLPanelObject::onCancelSculpt(const LLSD& data)
{

7
indra/newview/llpanelobject.h
View File

@ -88,6 +88,8 @@ public:
void onSelectSculpt(const LLSD& data);
BOOL onDropSculpt(LLInventoryItem* item);
static void onCommitSculptType( LLUICtrl *ctrl, void* userdata);
// <FS:Ansariel> FIRE-10125: Textures can be dragged into sculpt texture picker for meshes
BOOL onDragSculpt();
protected:
void getState();
@ -225,6 +227,11 @@ protected:
LLPointer<LLViewerObject> mObject;
LLPointer<LLViewerObject> mRootObject;
// <FS:Ansariel> FIRE-10125: Textures can be dragged into sculpt texture picker for meshes
bool mIsMesh;
bool mIsEditable;
// </FS:Ansariel>
};
#endif