Commit Graph

31392 Commits (be45cff44fae3f2e28ab4784e7b73aac20f736f9)

Author SHA1 Message Date
Oz Linden ce284c28d8 merge changes for 3.7.2-release 2014-03-03 15:43:55 -05:00
Oz Linden a5e56067c2 merge changes for 3.7.2-release 2014-03-03 15:36:34 -05:00
Oz Linden 55ceeae752 merge changes for storm-2008 2014-03-03 15:29:32 -05:00
Oz Linden dfbc6c65f6 merge changes for open-203 2014-03-03 15:08:20 -05:00
Baker Linden 28d3bb0975 [MAINT-3555][MAINT-3703]
- Removed logging for MAINT-3555
- Added NULL guard to fix MAINT-3703 (hopefully)
2014-03-03 11:53:57 -08:00
Jonathan Yap 840e1da8aa STORM-2017 Untranslatable text appears when scaling, or moving objects 2014-03-03 14:08:26 -05:00
Ricky Curtice 3e09cdefff Fixed compile-time errors. My bad.
Serves me right for not waiting through the compile!
2014-03-02 22:06:24 -08:00
Ricky Curtice 2db27d09c1 Better code documentation. 2014-03-02 16:48:25 -08:00
Ricky Curtice bd41d696de STORM-1920: Corrected bug where snap values would highlight that weren’t supposed to be highlighting. Did some more cleanup and documentation.
Also corrected a bug in Richard’s patch that resulted in the object scaling up when the mouse went the opposite direction from the scale.  The issue is that the vector length is an absolute value.  To allow for "negative" results to be found and discarded, I instead used a dot product with a parallel unit vector to get the signed magnitude - or, if you prefer, the mono-dimensional vector.

This bug only surfaced once the code made to actually work as intended in regards to the highlighting.  Turns out that if the snapped value was at 2, any axis that was showing values would highlight its "2" text - and the same for all other values.
To fix this, I used a simple enum and repurposed the property that tracked whether or not the cursor was in a snap regime.  Now it not only tracks whether or not the cursor is in a snap regime, but which one it is in.  This allowed the highlight render code to be able to differentiate which row was supposed to highlight and which did not.

A couple more duplicated math operations were reduced by rearranging the order of some variable definitions.  If at all possible, only do division once.  The result is much cleaner and easier to read code.
Several deprecated vector functions were updated to match their new versions.  If you are going to mark something deprecated, why not just take the time to go through and find all uses and clean it up!?
faceToUnitVector() was cleaned up to use the single-output design, matching cornerToUnitVector().
A mess of trailing whitespace was cleaned out.
Many more LLManipScale private variables are now documented - though I only documented those I understood fully while reading where they were created and how they were used.
2014-03-02 16:28:38 -08:00
Ricky Curtice 871bae45ba STORM-1920: From Richard, fix for scale sliding when mouse goes in the opposite direction of the scale.
I had discovered a set of bugs in the fix he sent me involving when the user decided to move the mouse in the opposite direction.  This fixes the bug where the scale would start sliding around.
2014-03-02 15:49:17 -08:00
Ricky Curtice e8a2d3b73b Merge 2014-03-02 15:42:18 -08:00
Ricky Curtice e0a015920d STORM-1920: Richard fixed and optimized a ton more math.
From Richard: There are a bunch of things I changed...mainly I eliminated all the grid_offset nonsense and instead simply calculate the tick index for the current drag position and use that to generate a snapped position as needed.  I still use approx_equal because I want grid numbers to light up even when they aren't the axis you are currently snapping to.
2014-03-02 14:33:57 -08:00
Merov Linden 807fa3ee06 Pull merge of codesign workaround 2014-02-27 15:21:39 -08:00
simon 3f9f8bb8bf Merge JJ's viewer-release-codesign-workaround 2014-02-27 13:28:56 -08:00
Aura Linden 22ea5ac41c BUG-4260 Updated to 4.6.x vivox libraries for Mac and Windows. 2014-02-26 20:15:45 -08:00
Simon Linden 0a46023db5 Fix linux build - make default check in switch statement 2014-02-26 23:52:34 +00:00
Richard Linden ac9849fb03 fixed mispelling of generateOutgoingAdHocHash 2014-02-26 11:59:49 -08:00
Richard Linden ccc15df25f MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restart 2014-02-26 11:58:37 -08:00
James Johnson 556506278a Merged lindenlab/viewer-release into default 2014-02-26 10:16:07 -08:00
maksymsproductengine 483ad8dc55 MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26 20:14:41 +02:00
simon 100b9154dd MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoid
about the return type for calls to LLView::getParent(): never assume a down
cast is possible.
2014-02-26 12:49:29 -08:00
simon 6f1df3172e Merge viewer-release 2014-02-25 16:45:19 -08:00
Baker Linden 9c31fab51b merge 2014-02-25 16:42:44 -08:00
Baker Linden bd73465e51 [MAINT-3784] - Viewer takes too long to shut down
- Removed a lot of logging code to reduce application close time
2014-02-25 16:41:23 -08:00
Oz Linden acc71d628d fix typo 2014-02-25 17:20:44 -05:00
Oz Linden 64816059b6 don't use the simulator channel in the keywords cache file name 2014-02-25 14:44:53 -05:00
Oz Linden 057544757c keywords_lsl_default.xml updates from the simulator tree 2014-02-25 14:14:21 -05:00
Oz Linden 1d30fe9554 merge changes for 3.7.2-release 2014-02-25 13:31:01 -05:00
Oz Linden 9b42503379 merge latest changes from Ima with 3.6.14-release 2014-02-25 13:30:16 -05:00
Richard Linden 80b4a4a1f5 merge with release 2014-02-24 18:45:59 -08:00
obscurestar 8fd270af1c Pulled from release. 2014-02-24 15:12:04 -08:00
Merov Linden 1dd9073571 Pull merge from viewer-maint-2287 2014-02-24 13:53:10 -08:00
Merov Linden 245de340d7 Pull merge from viewer-release 2014-02-24 13:23:39 -08:00
Oz Linden de8fea1362 increment viewer version to 3.7.3 2014-02-24 14:50:35 -05:00
Oz Linden 7910c686ca Added tag 3.7.2-release for changeset b842534cb4d7 2014-02-24 14:50:35 -05:00
Jonathan Yap 199e65a6c5 STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only. 2014-02-24 10:57:53 -05:00
Ricky Curtice 12dc73c74d Simple variable cleanup.
There was a lot of repeated division that was obscuring meaning, along with a variable that was always identical to another preexisting variable.  This last was probably an archaism, and was just due for removal.
2014-02-22 22:12:34 -08:00
JJ Linden 0abdab7848 changed variable names and errors to more accurately reflect the operation being performed 2014-02-21 11:59:17 -08:00
simon 7028d24c2c Merge oz_linden/viewer-fewerpkgs 2014-02-21 11:00:28 -08:00
Baker Linden 7faaaa9b11 [MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the cause of the crash 2014-02-20 15:23:53 -08:00
Oz Linden 8ead3308be remove experimental cdn packages 2014-02-20 16:44:41 -05:00
maksymsproductengine ba0b11fee1 Fix build problem 2014-02-20 19:45:47 +02:00
JJ Linden 251bf8ceca duplicated the workaround added for darwin codesigning onto the windos codesigning 2014-02-19 14:40:27 -08:00
Richard Linden ef591d280e Merge with release 2014-02-19 12:32:08 -08:00
Ricky Curtice 9f4031edff STORM-1920: Documented the meaning of some of the variables involved, built simplest change to solve issue.
The highlighting code assumed that the axis of the scaling movement was aligned with the scale tick marks - e.g. one of the cardinal directions with respect to the OBB of the selection.  This was and is NOT true when dragging from the corner, aka scaling more than one axis at a time.  The solution was to calculate the measured distance by projecting the snapped distance along the snap direction onto the axis of the relevant snap guide.  This gives the correct values, and is nice and clean - both in the change involved, and in the values returned.

However, while the fundamental misunderstanding in the code has been cleaned up by this change, the tick_val variable has so much jitter in the bottom end that the is_approx_equal function doesn’t come true > 98% of the time.  This is the next problem to solve.
2014-02-18 23:20:46 -08:00
Ricky Curtice a060dcfff7 STORM-1920: Math cleanup from Richard Linden. 2014-02-18 23:03:13 -08:00
Merov Linden d2b604c611 Pull merge from lindenlab/viewer-release 2014-02-17 14:15:00 -08:00
Monty Brandenberg acb265a394 Merge. Refresh from viewer-release after 3.7.1 release. 2014-02-14 18:49:33 -05:00
Oz Linden ce7e19d33a increment viewer version to 3.7.2 2014-02-14 16:00:45 -05:00
Oz Linden cb9e53414d Added tag 3.7.1-release for changeset dcb4981ce255 2014-02-14 16:00:45 -05:00