diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
| commit | dec487cd7f04f00d4aa6428d190ffbf978ea57da (patch) | |
| tree | d96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/newview/lltooldraganddrop.cpp | |
| parent | c9775dde6249582f0e8976be15e72bfebc4ac3fc (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-release
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rwxr-xr-x | indra/newview/lltooldraganddrop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index ef7d0cd81b..1a137f7129 100755 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -355,7 +355,7 @@ void LLToolDragAndDrop::setDragStart(S32 x, S32 y) BOOL LLToolDragAndDrop::isOverThreshold(S32 x,S32 y) { - static LLCachedControl<S32> drag_and_drop_threshold(gSavedSettings,"DragAndDropDistanceThreshold"); + static LLCachedControl<S32> drag_and_drop_threshold(gSavedSettings,"DragAndDropDistanceThreshold", 3); S32 mouse_delta_x = x - mDragStartX; S32 mouse_delta_y = y - mDragStartY; |