diff --git a/.hgtags b/.hgtags
index 4922a51e57d790b3be78c8828a5541e0e644a5e1..d40a538e0558350b702c206bef49c8121b417e87 100644
--- a/.hgtags
+++ b/.hgtags
@@ -331,4 +331,5 @@ af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
+bce218b2b45b730b22cc51e4807aa8b571cadef3 DRTVWR-173
 f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 6703ef4a41d8aa3a7735e456c4cd857e5fa3b6c4..ec36cf48c2fbf7974a18f279eca874cd97679a26 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;