summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorKarl Steifvater <qarl@lindenlab.com>2008-03-20 21:14:33 +0000
committerKarl Steifvater <qarl@lindenlab.com>2008-03-20 21:14:33 +0000
commitb502c86f30d3ed01b795548364ab8090363eeac5 (patch)
tree2a82118d099e58e616796bb3707f5bd0e5ef2380 /indra
parent2b59d3b0130bd7ef83c4123b7e996bed886950f8 (diff)
DEV-12219 Objects pulled from inventory showing up underground
fixes bug introduced by the maint-ui branch
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltooldraganddrop.cpp7
1 files changed, 5 insertions, 2 deletions
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