aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmanipscale.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/llmanipscale.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llmanipscale.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index fe6bc26..f69dca4 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -1172,9 +1172,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
1172 mInSnapRegime = FALSE; 1172 mInSnapRegime = FALSE;
1173 } 1173 }
1174 1174
1175 BOOL send_scale_update = FALSE;
1176 BOOL send_position_update = FALSE;
1177
1178 LLVector3 dir_agent; 1175 LLVector3 dir_agent;
1179 if( part_dir_local.mV[VX] ) 1176 if( part_dir_local.mV[VX] )
1180 { 1177 {
@@ -1191,8 +1188,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
1191 stretchFace( 1188 stretchFace(
1192 projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent, 1189 projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent,
1193 projected_vec(drag_delta, dir_agent)); 1190 projected_vec(drag_delta, dir_agent));
1194 send_position_update = TRUE;
1195 send_scale_update = TRUE;
1196 1191
1197 mDragPointGlobal = drag_point_global; 1192 mDragPointGlobal = drag_point_global;
1198} 1193}