diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
| commit | bedbbf7c0201275e0a48a0cbbb2a567be4baab3d (patch) | |
| tree | f11f9e612ab503e596073269c17c6e4cc1d3ae13 /indra/newview/llpanelobject.cpp | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | f3afac420cd3c89eb396fb1f0b77ab4804212415 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 1f77e7a602..7dfe529b73 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -245,6 +245,7 @@ BOOL LLPanelObject::postBuild() mCtrlSculptTexture->setDropCallback( boost::bind(&LLPanelObject::onDropSculpt, this, _2 )); // 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); // Allow any texture to be used during non-immediate mode. mCtrlSculptTexture->setNonImmediateFilterPermMask(PERM_NONE); LLAggregatePermissions texture_perms; |