aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmanipscale.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-07-15 03:59:58 +1000
committerDavid Walter Seikel2013-07-15 03:59:58 +1000
commitc7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch)
tree3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llmanipscale.cpp
parentMore Windlight refactoring, including moving the new stuff back to lightshare.c. (diff)
parentFix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff)
downloadmeta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip
meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz
meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2
meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llmanipscale.cpp')
-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 33ee1b9..593f765 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}