summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-03-03pull codesign fixesOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-03-03merge changes for storm-2008Oz Linden
2014-03-03merge changes for open-203Oz Linden
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
- Removed logging for MAINT-3555 - Added NULL guard to fix MAINT-3703 (hopefully)
2014-03-03STORM-2017 Untranslatable text appears when scaling, or moving objectsJonathan Yap
2014-03-02Fixed compile-time errors. My bad.Ricky Curtice
Serves me right for not waiting through the compile!
2014-03-02Better code documentation.Ricky Curtice
2014-03-02STORM-1920: Corrected bug where snap values would highlight that weren’t ↵Ricky Curtice
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-02STORM-1920: From Richard, fix for scale sliding when mouse goes in the ↵Ricky Curtice
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-02MergeRicky Curtice
2014-03-02STORM-1920: Richard fixed and optimized a ton more math.Ricky Curtice
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-02-27Pull merge of codesign workaroundMerov Linden
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
2014-02-26BUG-4260 Updated to 4.6.x vivox libraries for Mac and Windows.Aura Linden
2014-02-26Fix linux build - make default check in switch statementSimon Linden
2014-02-26fixed mispelling of generateOutgoingAdHocHashRichard Linden
2014-02-26MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restartRichard Linden
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-26MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoidsimon
about the return type for calls to LLView::getParent(): never assume a down cast is possible.
2014-02-25Merge viewer-releasesimon
2014-02-25mergeBaker Linden
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
- Removed a lot of logging code to reduce application close time
2014-02-25fix typoOz Linden
2014-02-25don't use the simulator channel in the keywords cache file nameOz Linden
2014-02-25keywords_lsl_default.xml updates from the simulator treeOz Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-25merge latest changes from Ima with 3.6.14-releaseOz Linden
2014-02-24merge with releaseRichard Linden
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-maint-2287Merov Linden
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24Added tag 3.7.2-release for changeset b842534cb4d7Oz Linden
2014-02-24STORM-2015 Region restart sound alerts from all users on a STORM-1980 ↵Jonathan Yap
enabled viewer play inworld - should be local only.
2014-02-22Simple variable cleanup.Ricky Curtice
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-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-21Merge oz_linden/viewer-fewerpkgssimon
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-20remove experimental cdn packagesOz Linden
2014-02-20Fix build problemmaksymsproductengine
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
2014-02-19Merge with releaseRichard Linden
2014-02-18STORM-1920: Documented the meaning of some of the variables involved, built ↵Ricky Curtice
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-18STORM-1920: Math cleanup from Richard Linden.Ricky Curtice
2014-02-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg