Commit Graph

32814 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Callum Prentice 11915dc888 WENG-1470 (Partial impl) Secondlife Login Screen Redesign 2014-03-03 16:38:38 -08:00
Oz Linden 3e5fb8a274 merge changes for codesign workaround 2014-03-03 17:01:45 -05:00
Oz Linden fbdbea1b18 merge changes for 3.7.2-release 2014-03-03 17:01:19 -05:00
Oz Linden 1ad94b5a9a pull codesign fixes 2014-03-03 15:44:37 -05:00
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
Merov Linden 83c3e37a26 ACME-1336 : Fix message when FB friends list is empty 2014-03-03 10:42:26 -08:00
maksymsproductengine 100b0f48a9 MAINT-2902 FIXED Browser secure session indicator should be prominent 2014-03-03 20:13:09 +02: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
Merov Linden 66287bf951 ACME-1335, ACME-1336 : Add callbacks to FB events so to update the FB friend lists in a timely manner 2014-03-02 18:01:32 -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
Richard Linden 0630ac4d87 MAINT-2059 FIX Corner scaling doesn't highlight distance text
code cleanup
2014-02-28 22:35:12 -08:00
Richard Linden 07c90b5df3 MAINT-2059 FIX Corner scaling doesn't highlight distance text
better highlighting of opposite axis when corner scaling
2014-02-28 20:32:45 -08:00
Merov Linden 0fb59172f7 ACME-1335, ACME-1336 : Add info text to the Friends tab in Facebook when no friends are visible 2014-02-28 16:10:27 -08:00
Merov Linden 209ed601dd ACME-1332 : Update the friends lists in the FB Friends panel when friend status (add/remove) changes 2014-02-28 13:54:22 -08:00
Richard Linden f304eea6a9 MAINT-2059 FIX Corner scaling doesn't highlight distance text
fixed case where trying to shrink the object below zero size would mess up grid rulers
2014-02-28 12:21:29 -08:00
Dave Parks 6abbe4cf55 Automated merge with https://bitbucket.org/lindenlab/viewer-lion 2014-02-28 13:35:03 -06:00
andreylproductengine d9d2659e11 MAINT-3752: Changed the "Show me in Search result" checkbox caption 2014-02-28 16:47:18 +02:00
Mnikolenko ProductEngine 80ba9cfeb1 MAINT-2613 Two entries for 'DisablePrecacheDelayAfterTeleporting' in settings.xml 2014-02-28 15:37:41 +02:00
andreykproductengine 7a45e6fd77 MAINT-358 FIXED [PUBLIC]Verbs buttons are available for landmarks folder if it was selected via keyboard 2014-02-28 15:33:09 +02:00
Cho 261e728327 Made lists only visible when populated in Friends tab in Facebook floater for ACME-1334 2014-02-28 02:08:29 +00:00
Cho df26597c0d Added FB+SL friends list to Friends tab in Facebook floater for ACME-1334 2014-02-28 01:49:58 +00:00
Callum Prentice 6e21b127d4 merge with head 2014-02-27 16:27:58 -08:00
Callum Prentice d3abd1ca85 Support for multiple buttons 2014-02-27 16:26:31 -08:00
Dave Parks 7835d48f6d Automated merge with https://bitbucket.org/lindenlab/viewer-lion 2014-02-27 18:06:48 -06:00
Merov Linden 0bd5fffcac Pull merge from viewer-acme 2014-02-27 16:04:17 -08:00
Merov Linden ceec7b7efe ACME-1333 : Allow Facebook panel to be resized, fixed ensuing follow positioning issues in all subpanels 2014-02-27 16:03:35 -08:00
Dave Parks a8e22e11c5 MAINT-2980 Rename "Texture Memory" to "Video Memory" in hardware floater and increase limit.
Limit should be however much vram is installed, but underneath the hood, fudge
how much memory is used for textures to avoid swapping.

Also, catch exceptions when attempting to build a GL context on windows and
display an error dialog instead of crashing.
2014-02-27 17:49:50 -06:00
Merov Linden 807fa3ee06 Pull merge of codesign workaround 2014-02-27 15:21:39 -08:00
Merov Linden d3c45d65d0 Pull merge of codesign workaround 2014-02-27 15:17:36 -08:00
simon 7ad70e0f24 Merge downstream code 2014-02-27 13:38:21 -08:00
simon 8b28593c10 Merge downstream code 2014-02-27 13:36:05 -08:00
simon 3f9f8bb8bf Merge JJ's viewer-release-codesign-workaround 2014-02-27 13:28:56 -08:00
Merov Linden eb942229c4 Pull merge from viewer-acme 2014-02-27 13:20:51 -08:00
Merov Linden 279e9b0743 ACME-1327 : Implemented preview in all SL Share panels, switch ownership of preview to focused SL Share photo panel 2014-02-27 13:04:23 -08:00
Mnikolenko ProductEngine 3085c6e188 MAINT-3778 Develop>RenderMetadata>LOD Info no longer displays values for objects 2014-02-27 12:22:02 +02: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
Merov Linden ed38a0aede ACME-1327 : WIP : Make rescale of preview isotropic, make preview button a toggle 2014-02-26 17:22:16 -08:00
Simon Linden 0a46023db5 Fix linux build - make default check in switch statement 2014-02-26 23:52:34 +00:00
Cho d80a812ffc Changed SLShare photo upload filename to Untitled for the sake of default Flickr title 2014-02-26 20:21:05 +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