diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-02 12:38:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-02 12:38:07 -0400 |
| commit | ed5b46c9b0f71b458f8dd58a9c76ae51f974726b (patch) | |
| tree | e48c8a1dbe48157798d0625c6d54606b25ebc208 /indra/newview/lltexturectrl.cpp | |
| parent | 9b1208e4958859e2328ce60acc4d8efaa5dbeed2 (diff) | |
| parent | 077e851bdd8e46fa9d5a43712dacdf5945a979f7 (diff) | |
merge back changes from 3.3.4-beta2
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 6703ef4a41..ec36cf48c2 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -819,7 +819,10 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem mNoCopyTextureSelected = FALSE; if (itemp) { - mTextureSelectedCallback(itemp); + if (!mTextureSelectedCallback.empty()) + { + mTextureSelectedCallback(itemp); + } if (!itemp->getPermissions().allowCopyBy(gAgent.getID())) { mNoCopyTextureSelected = TRUE; |