diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-27 17:16:59 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-27 17:16:59 -0500 | 
| commit | 7f38f620fd9c3e9de5453f47b942f4dd3b5d2e77 (patch) | |
| tree | 4314015cb86955a4b9b94d109a7a177d9176bd26 /indra/newview | |
| parent | 8a7fa77f23b94f9ba2cb6da1942e4f86da314b5a (diff) | |
MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools.
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;  | 
