summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-06-27 19:33:27 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-06-27 19:33:27 +0300
commit0eda1f9a4d909870b15c6d7243e47838540598e8 (patch)
treed57f7dd0572ddbd1cfc419d25ed81320463251c3 /indra
parent9091986c698af6d008a12f1944724609d649b63e (diff)
CHUI-169 FIX Restored inventory sharing functionality via IM floater drag and drop.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimfloater.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 1bbf6cc320..b94a4048d4 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -1077,6 +1077,12 @@ BOOL LLIMFloater::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
*accept = ACCEPT_NO;
}
}
+ else if (mDialog == IM_NOTHING_SPECIAL)
+ {
+ LLToolDragAndDrop::handleGiveDragAndDrop(mOtherParticipantUUID, mSessionID, drop,
+ cargo_type, cargo_data, accept);
+ }
+
return TRUE;
}