diff options
| author | callum <none@none> | 2012-06-29 10:36:04 -0700 |
|---|---|---|
| committer | callum <none@none> | 2012-06-29 10:36:04 -0700 |
| commit | 11686a0917c7e6e67920aca46ade4624c5027c0e (patch) | |
| tree | 69f56b63cf711b6aef97e0b06d981e5c8087375a /indra/newview/llpanelobject.cpp | |
| parent | fd4708c2c4f221d9f2029072f786e169e119ba1a (diff) | |
| parent | 326634e1bf9b87e9c9311b67539abb43323bd33c (diff) | |
Merge with viewer-beta
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; |