Commit Graph

52 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
Mnikolenko Productengine 8c79214f0b MAINT-6970 FIXED Crash in LLFloaterPermsDefault::updateCap() 2016-11-30 15:03:22 +02:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky c20277f2f5 Merge. 2015-12-21 20:52:46 +01:00
Rider Linden 2763bbd975 Initial changes for Vivox/Azumarill merge. Lots of temporary code and conditional compile switches. Begin switch from statemachine to coroutine. 2015-12-04 14:27:22 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky c218e524b2 Merge - Step 1; Still enough to do. 2015-10-26 20:20:13 +01:00
Rider Linden 53b947e039 Merge from viewer release. 2015-10-19 12:03:08 -07:00
Ansariel fd4da22ed6 BUG-10466: Default creation permissions changes for objects don't work until you relog; Also set cap sent = true only on success so we automatically retry on region change 2015-10-13 09:28:11 +02:00
Rider Linden 75c6549fde Set consistent terminology for yield/wait -> suspend for coroutines. 2015-09-18 11:39:22 -07:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
Nat Goodspeed efa9a0f99c Backed out changeset bab1000e1b2d: restore 'selfless' changes 2015-07-10 19:30:10 -04:00
Rider Linden 247eb0c9c3 Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5 2015-07-07 19:41:27 +01:00
Nat Goodspeed b262ded7e0 MAINT-5351: Remove 'self' parameter from coroutine functions.
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
pavelkproductengine d201f49ce3 MAINT-5137 FIXED Warning sometimes appears at login - Alert: There was a problem
Added logic to resend HTTP request for default perms saving
2015-06-04 20:03:20 +03:00
Rider Linden e9257f034a Object default perm floater 2015-05-22 15:33:40 -07:00
Oz Linden 6324e58000 improve logging of errors in default permissions cap 2015-04-02 21:11:22 -04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Brad Payne (Vir Linden) c7c549b7e2 LLFloaterPermsResponder switched to new Responder API 2014-11-26 11:39:16 -05:00
Ansariel 8b37bc06e4 FIRE-15869: Introduce some retry functionality for sending default perms and not bug the user if it fails the first time 2015-04-15 23:40:01 +02:00
Tank_Master d06a0217d9 Merge LL 3.7.26 2015-03-23 12:29:56 -07:00
Ansariel 95c33139b9 Update new default perms floater to use new cURL API 2015-01-12 15:03:51 +01:00
Ansariel e7d6a03530 Adjust new default perms for OpenSim:
* Only use our old new object perms method if we are not in SL or using caps resulted in an error
* Removed new object perms settings from Firestorm preferences panel as they are now set via the new default perms floater
2015-01-12 13:40:25 +01:00
Jonathan Yap a4173dc81a STORM-68 Remove obsolete note. Refactor a few blocks of code to not have early returns 2014-01-08 09:30:30 -05:00
Jonathan Yap c804c6b69e STORM-68 Remove Apply button
Add menu entry to Build->Options->Set Default Permissions...
Disable Preferences->Advanced->Default Creation Permissions button when on login screen
Add code for a one-time conversion from the old upload settings
XML cleanup
2013-12-12 14:11:28 -05:00
Jonathan Yap 2d701456a0 STORM-68 Fix bug for new gestures, notecards, and scripts where a copied item did not preserve its default permissions.
Add apply button.
2013-12-12 08:51:15 -05:00
Jonathan Yap 096530b726 STORM-68 Get display error message once to work properly 2013-12-05 14:42:14 -05:00
Jonathan Yap 944840c8b1 STORM-68 Code cleanup/function renaming 2013-12-05 13:26:43 -05:00
Jonathan Yap 9e8a7869ce STORM-68 Change CAP name to AgentPreferences and adjust LLSD format to mesh with server changes 2013-12-03 10:44:44 -05:00
Jonathan Yap 176901422f STORM-68 Reapply changes to inventory processing lost in the merge.
Move call to updateCap back to where it was.  The place it was moved
to was too early in the login sequence and was causing a crash.
2013-11-20 10:21:41 -05:00
Oz Linden 0031e9a97b merge up to 3.6.10-release; some of the storm-68 changes lost 2013-11-19 17:59:55 -05:00
Jonathan Yap b7edc965bc STORM-68 Place initial call to send cap in new, better location.
Make processing of debug setting names a little more elegant.
2013-11-19 16:32:41 -05:00
Jonathan Yap 56b1b35a18 STORM-68 Send default permissions to simulator just once after logging in 2013-11-11 13:21:12 -05:00
Jonathan Yap e988fffbca STORM-68 Add initial support to use a capability for setting default object
permissions on the server.
2013-11-07 16:27:38 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Jonathan Yap 052dc39820 STORM-68 Fix for group perms not being defined correctly and fix for group and everyone perms failing to copy and paste 2012-06-12 14:26:53 -04:00
Jonathan Yap b6df9b6d56 STORM-68 Fiddling with debugging for New Script case 2012-06-09 11:43:39 -04:00
Jonathan Yap d61a5f743c STORM-68 Removed debugging PERM_ALL that was causing upload trouble and removed 3 obsolete debug settings 2012-06-09 10:05:54 -04:00
Jonathan Yap fbb4e5fb0f STORM-68 As a Builder, I want that ability to set default permissions on creation of objects, clothing, scripts, notecards, etc.
First pass at implementation, debuggins lines still need to be removed and there is one known bug to be resolved.
2012-06-08 13:49:02 -04:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Merov Linden 97d52e2a3e SNOW-680 VWR-10854 : Honour share with group and allow anyone to copy for snapshots 2010-08-31 21:07:23 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00