diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-03-02 22:06:24 -0800 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-03-02 22:06:24 -0800 |
| commit | 3e09cdefff9bc58c193dca4b08e97d59fa008838 (patch) | |
| tree | 796dd7012a6d5ea9002ac1a6ee901eed9e56defa /indra/newview | |
| parent | 2db27d09c1327af94d02376e31eeafb45f4f6d82 (diff) | |
Fixed compile-time errors. My bad.
Serves me right for not waiting through the compile!
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llmanipscale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index 26ebf06d49..a17f615019 100755 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -1106,7 +1106,7 @@ void LLManipScale::dragFace( S32 x, S32 y ) if (snap_enabled && dist_from_scale_line > mSnapRegimeOffset) { - mSnapRegime = SNAP_REGIME_UPPER | SNAP_REGIME_LOWER; // A face drag doesn't have split regimes. + mSnapRegime = static_cast<ESnapRegimes>(SNAP_REGIME_UPPER | SNAP_REGIME_LOWER); // A face drag doesn't have split regimes. if (dist_along_scale_line > max_drag_dist) { |