Commit Graph

35897 Commits (00a193e740536bc8dbdc7a4c52ae8d75efba0037)

Author SHA1 Message Date
andreykproductengine 00a193e740 MAINT-6460 Crash calculating mesh complexity 2016-07-14 15:21:39 +03:00
andreykproductengine b06d5aeec8 MAINT-6460 Crash calculating mesh complexity 2016-07-12 21:37:45 +03:00
Rider Linden 85c0bec92c Merge 2016-07-12 12:11:01 -07:00
Rider Linden c0407af8ab STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer allocation. 2016-07-12 11:07:05 -07:00
Rider Linden c1c9b3d74e MAINT-6565: Grab a shared pointer and encapsulate it into the bind call in place of this. Ensures that the impl is not deleted while the coroutine is active. 2016-07-11 16:33:11 -07:00
andreykproductengine a3f63bce3c MAINT-6534 Resetting scripts via the build menu no longer works on many scripted objects 2016-07-11 16:23:18 +03:00
andreykproductengine 1c7548d3bf MAINT-6448 PERMISSION_DEBIT notification should default to Deny 2016-07-08 15:07:52 +03:00
AndreyL ProductEngine 8d542a46c7 MAINT-6534 Fixed the LLSD validation failure 2016-07-08 18:50:19 +03:00
AndreyL ProductEngine c7c8fac310 Merged in lindenlab/viewer-release 2016-07-07 00:15:41 +03:00
Oz Linden f868e29945 increment viewer version to 4.0.7 2016-07-06 16:52:24 -04:00
Oz Linden e67b8e3095 Added tag 4.0.6-release for changeset 4070611edd95 2016-07-06 16:52:23 -04:00
andreykproductengine 33be227716 MAINT-6448 PERMISSION_DEBIT notification should default to Deny 2016-06-02 19:59:35 +03:00
andreykproductengine e2ee3a1519 MAINT-6534 Resetting scripts fails due to small timeout 2016-06-30 16:47:12 +03:00
AndreyL ProductEngine 2b287b6bf7 MAINT-6511 Added a null check in LLFloaterView::restoreAll 2016-06-16 23:27:39 +03:00
Rider Linden 0597f87646 MAINT-6486: Use literal string. Don't try and look it up. 2016-06-15 13:42:39 -07:00
andreykproductengine c664ae73c3 MAINT-6460 additional header check 2016-06-15 18:01:44 +03:00
Andrey Lihatskiy d1d39c1dd4 Merged in rider_linden/viewer-lynx (pull request #26) 2016-06-13 20:53:47 +03:00
Rider Linden a3c4d1cd20 Merge MAINT-6486 2016-06-13 09:23:20 -07:00
Rider Linden c8b6628140 Make string ref in HandleScriptUserData const 2016-06-10 13:25:22 -07:00
Rider Linden 1e803a6bd7 MAINT-6486: Be sure that all the script queue functions hit all objects and scripts in those objects. Convert from responders and callbacks to coroutines. 2016-06-10 12:33:39 -07:00
andreykproductengine 1adfaa081f MAINT-6446 Correct password length handling 2016-06-01 16:56:04 +03:00
Andrey Lihatskiy 9177aa3bb6 Merged in andreyl_productengine/viewer-lynx-marchcat (pull request #25)
MAINT-6461 Added a null check
2016-06-08 04:45:51 +03:00
AndreyL ProductEngine f9023371ba MAINT-6461 Added a null check 2016-06-08 03:49:55 +03:00
andreykproductengine aca2dab2d0 MAINT-6460 Crash calculating mesh complexity 2016-06-03 20:09:33 +03:00
Oz Linden 02cf29d1e7 dummy merge to really get rid of extra head per hg trick at http://bit.ly/1R8WhaY 2016-05-31 13:38:08 -04:00
Oz Linden 743f1aa750 dummy merge to really get rid of extra head per hg trick at http://bit.ly/1R8WhaY 2016-05-31 13:37:23 -04:00
andreykproductengine f282c31f01 MAINT-2129 One more Block button 2016-05-31 16:56:45 +03:00
AndreyL ProductEngine 0d5edb03a2 MAINT-6435 Deafult preset should set the same settings as the "Reset to recommended settings" button 2016-05-27 03:34:37 +03:00
Rider Linden 9ea13d49b7 Merge 2016-05-24 14:32:06 -07:00
Rider Linden 26b1c020c8 MAINT-6403: Updated a couple comments and dropped a couple warning levels back down to DEBUG. 2016-05-24 13:03:36 -07:00
ruslantproductengine 67f8d57927 MAINT-6216 avatars are sometimes invisible
BUG-10330 Sitting avatars are sometimes invisible
2016-05-24 15:17:41 +03:00
Mnikolenko Productengine fb598cd380 MAINT-2583 Minimized floaters cannot brought back to foreground anymore 2016-05-25 12:39:27 +03:00
AndreyL ProductEngine 110c0658b7 MAINT-6413 Buildfix 2016-05-25 03:47:23 +03:00
AndreyL ProductEngine 6f4d9a2321 MAINT-6424 Reverted disabling of the "Delete preset" button 2016-05-25 03:29:53 +03:00
Andrey Lihatskiy 238c1216c3 Merged in rider_linden/viewer-lynx (pull request #18)
MAINT-6403: Correct the local COF version from AIS when it loses sync.
2016-05-25 02:41:33 +03:00
Andrey Lihatskiy 00eda9e525 Merged in lindenlab/viewer-lynx-maint-6413 (pull request #16) 2016-05-25 02:40:48 +03:00
Glenn Glazer 650df5b2e9 merge from maint-6413 into lynx for pull request 2016-05-24 14:50:01 -07:00
Glenn Glazer ce760e80c4 MAINT-6413: write summary.json from viewer_manifest.py, remove facility from cmake 2016-05-24 11:43:57 -07:00
Rider Linden c7413e51b6 MAINT-6403: in the case of a version mismatch between the viewer's local accounting and the AIS reported. Override with the AIS version. simplify the appearance update code to account for new versioning. Fix spelling of descendant 2016-05-23 14:40:43 -07:00
Glenn Glazer 999a949b52 debug version args 2016-05-23 13:49:26 -07:00
Glenn Glazer 9c28c06f1d backout 354346 / e63c00cf654a and 354347 / e4bfe3ee05a6 2016-05-23 12:08:59 -07:00
Glenn Glazer 8c45877871 backout 354345 2016-05-23 12:05:53 -07:00
Andrey Lihatskiy 380bbc01c9 Merged in andreyl_productengine/viewer-lion-marchcat (pull request #42)
MAINT-6424 Disable the delete button for empty graphics presets list
2016-05-23 20:45:24 +03:00
AndreyL ProductEngine 8edfdc617d MAINT-6424 Disable the delete button for empty graphics presets list
Fixed related notifications after improper merge as well
2016-05-23 02:23:03 +03:00
Ansariel 61a5c943ba MAINT-6432 Fix defaults for RenderAvatarMaxComplexity
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
2016-05-22 20:32:27 +02:00
AndreyL ProductEngine 602c9bc04a MAINT-6317 Restored the fix after a conflict resolution 2016-05-20 02:12:26 +03:00
AndreyL ProductEngine c50f96b492 Merged in lindenlab/viewer-lynx 2016-05-20 02:06:08 +03:00
AndreyL ProductEngine 445cd96293 Merged in lindenlab/viewer-release 2016-05-20 00:03:30 +03:00
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +03:00
Rider Linden 213bcf6bb3 MAIN-6403: If a version mismatch occurs when requesting the COF, request a new appearance update from the simhost to update the viewer COF version. 2016-05-19 11:47:23 -07:00