From b502c86f30d3ed01b795548364ab8090363eeac5 Mon Sep 17 00:00:00 2001 From: Karl Steifvater Date: Thu, 20 Mar 2008 21:14:33 +0000 Subject: DEV-12219 Objects pulled from inventory showing up underground fixes bug introduced by the maint-ui branch --- indra/newview/lltooldraganddrop.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index b4107192d6..6e72426976 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1471,8 +1471,11 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, // currently the ray's end point is an approximation, // and is sometimes too short (causing failure.) so we // double the ray's length: - LLVector3 ray_direction = ray_start - ray_end; - ray_end = ray_end - ray_direction; + if (bypass_sim_raycast == FALSE) + { + LLVector3 ray_direction = ray_start - ray_end; + ray_end = ray_end - ray_direction; + } // Message packing code should be it's own uninterrupted block -- cgit v1.2.3