diff options
| author | callum_linden <none@none> | 2014-10-20 11:08:54 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 11:08:54 -0700 |
| commit | c7fb834c9d67e9249093f4ae27f53aa5e9e6fee7 (patch) | |
| tree | ccfdf55c67705fc78ad955a23a543de8a792f43c | |
| parent | 5894e380b7a3437f79b03e3d71f0b5b0eaa7215f (diff) | |
Update to build on Xcode 6.0: cast doesn't change overloading rules - poorly commented
| -rwxr-xr-x | indra/newview/lltooldraganddrop.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 575e5c5c52..75620be69a 100755 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -947,8 +947,7 @@ void LLToolDragAndDrop::pick(const LLPickInfo& pick_info) const S32 item_index = mCurItemIndex; const EDragAndDropType dad_type = mCargoTypes[item_index]; // Call the right implementation function - (U32)callMemberFunction(*this, - LLDragAndDropDictionary::instance().get(dad_type, target)) + callMemberFunction(*this, LLDragAndDropDictionary::instance().get(dad_type, target)) (hit_obj, hit_face, pick_info.mKeyMask, TRUE); } } |