diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-29 16:15:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-29 16:15:24 -0400 |
| commit | 595b49b938b07c349b7c3a74ad70697cd423e2b3 (patch) | |
| tree | c19a9b23f2c625a65570da3f04e505d86f80fea7 /indra/newview | |
| parent | 326634e1bf9b87e9c9311b67539abb43323bd33c (diff) | |
| parent | a6b5b4322cffe7334f00895e1c0b9618c2f43f4a (diff) | |
merge changes for DRTVWR-173
Diffstat (limited to 'indra/newview')
| -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; |