Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | UbitUmarov | 2017-06-10 | 1 | -56/+65 |
|\ | |||||
| * | bug fix plus some cleanup | UbitUmarov | 2017-06-09 | 1 | -56/+65 |
| | | |||||
* | | merge fix | UbitUmarov | 2017-05-04 | 1 | -9/+12 |
|\ \ | |/ | |||||
| * | do the same in the cases we are just moving parts around and not changing ↵ | UbitUmarov | 2017-05-04 | 1 | -4/+2 |
| | | | | | | | | their caches (ie their taskInventory) | ||||
| * | move deep effective permissions aggregation to first time use and not on ↵ | UbitUmarov | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | changes. There flag it is need with InvalidateDeepEffectivePerms(). Add config options PropagateGroupShareOutwards and PropagateAnyOneOutwards | ||||
| * | still another missing conversion btw viewer and OS on groupd owned | UbitUmarov | 2017-05-03 | 1 | -4/+4 |
| | | |||||
| * | taskitem group owned information was still incorrect | UbitUmarov | 2017-05-03 | 1 | -1/+6 |
| | | |||||
| * | viewer can't tell if a taskitem is group owned if we don't tell him; ↵ | UbitUmarov | 2017-05-03 | 1 | -2/+9 |
| | | | | | | | | missing taskInv serial update | ||||
* | | viewer can't tell if a taskitem is group owned if we don't tell him; | UbitUmarov | 2017-05-03 | 1 | -2/+9 |
|/ | | | | missing taskInv serial update" | ||||
* | save a few nanoseconds | UbitUmarov | 2017-05-01 | 1 | -9/+16 |
| | |||||
* | exclude lms from permissions checks. They are full rights, and broken on all dbs | UbitUmarov | 2017-04-30 | 1 | -31/+5 |
| | |||||
* | a few changes to permissions folding... we are testing. at this point only ↵ | UbitUmarov | 2017-04-28 | 1 | -18/+28 |
| | | | | use master for TESTING also | ||||
* | add/fix CanRunScript | UbitUmarov | 2017-01-21 | 1 | -1/+1 |
| | |||||
* | add more calls to effective permissions aggregation, some paths may still be ↵ | UbitUmarov | 2017-01-17 | 1 | -1/+10 |
| | | | | missing on objects changes, but remove the aggregation on check paths, so all can be tested. | ||||
* | add more calls to effective permissions aggregation; do not change groupmask ↵ | UbitUmarov | 2017-01-17 | 1 | -0/+1 |
| | | | | on deed | ||||
* | avoid lastOwner beeing the group | UbitUmarov | 2017-01-16 | 1 | -1/+2 |
| | |||||
* | chance new effective permissions code to ease aggregation on demand( ie on ↵ | UbitUmarov | 2017-01-16 | 1 | -36/+4 |
| | | | | changes). But still doing full aggregation on checks, so still heavy | ||||
* | Merge branch 'melanie' | Melanie Thielker | 2017-01-16 | 1 | -4/+2 |
|\ | |||||
| * | Remove the last instance of the legacy slam but being set | Melanie Thielker | 2017-01-16 | 1 | -4/+2 |
| | | | | | | | | New objects now get only the real slam bit. | ||||
* | | add code for fixing effective permitions. This is a test, and currently too ↵ | UbitUmarov | 2017-01-15 | 1 | -2/+44 |
|/ | | | | slow for prodution. just finding our way home | ||||
* | fix: send viewers the Everyone permitions of items inside other objects | UbitUmarov | 2017-01-14 | 1 | -1/+1 |
| | |||||
* | Fix an artefact introduced by git's revert merging logic | Melanie Thielker | 2017-01-06 | 1 | -9/+6 |
| | |||||
* | Fix errors introduced by incomplete understanding of what folded perms are | Melanie Thielker | 2017-01-06 | 1 | -6/+13 |
| | |||||
* | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 1 | -29/+29 |
| | |||||
* | some changes to RequestInventoryFile() | UbitUmarov | 2016-07-09 | 1 | -38/+36 |
| | |||||
* | reduce lock time during object inventory ProcessInventoryBackup | UbitUmarov | 2016-07-07 | 1 | -7/+4 |
| | |||||
* | reduce the initial capacity of InventoryStringBuilder the 16k i added is | UbitUmarov | 2016-07-07 | 1 | -1/+1 |
| | | | | | | | unreasonable for most cases. The coment about performance on a previus commit refering to mantis 7904 was wrong, this changes will NOT do much in terms of objects inventory download time, only a bit on cpu and memory use" | ||||
* | hide the footprints of my previus bug ( take out comented code | UbitUmarov | 2016-07-07 | 1 | -3/+0 |
| | |||||
* | forget InventoryStringBuilder.close() | UbitUmarov | 2016-07-07 | 1 | -3/+3 |
| | |||||
* | change InventoryStringBuilder. This will do much for mantis 7904 objects ↵ | UbitUmarov | 2016-07-07 | 1 | -12/+21 |
| | | | | inventory sending is slow by design | ||||
* | Revert "More debug to diagnose osgrid" | Diva Canto | 2016-06-13 | 1 | -1/+1 |
| | | | | This reverts commit b5f29e93f6345987c0b9b8d6496b489e7336039b. | ||||
* | More debug to diagnose osgrid | Diva Canto | 2016-06-13 | 1 | -1/+1 |
| | |||||
* | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -13/+0 |
| | |||||
* | bad merge? | UbitUmarov | 2015-09-01 | 1 | -289/+523 |
|\ | |||||
| * | return bbox and offsetHeight to RezObject | UbitUmarov | 2014-11-19 | 1 | -5/+4 |
| | | |||||
| * | compile fix | UbitUmarov | 2014-09-21 | 1 | -3/+5 |
| | | |||||
| * | release lock a bit sooner when not needed, add a try on more complex db | UbitUmarov | 2014-09-21 | 1 | -4/+11 |
| | | | | | | | | store call | ||||
| * | protect getting the item | UbitUmarov | 2014-09-21 | 1 | -1/+3 |
| | | |||||
| * | remove redundant code | UbitUmarov | 2014-09-21 | 1 | -20/+7 |
| | | |||||
| * | taskInventory request: give each transfer a diferent filename, Add more | UbitUmarov | 2014-09-12 | 1 | -101/+96 |
| | | | | | | | | agressive lock | ||||
| * | apply objectSlamSale to all roots of coalescence objects. replace the | UbitUmarov | 2014-08-05 | 1 | -1/+1 |
| | | | | | | | | single object condition for renaming | ||||
| * | dont mess with names and descriptions on coalescence objects. Inventory | UbitUmarov | 2014-08-05 | 1 | -1/+3 |
| | | | | | | | | name can change for inventory purposes only. | ||||
| * | revert to old avn-current code, not using ApplyPermissionsOnRez() till its | UbitUmarov | 2014-08-05 | 1 | -1/+43 |
| | | | | | | | | reviewed/fixed | ||||
| * | replace old Attachoffset by AttachedPos. Comented out possible merge | UbitUmarov | 2014-07-20 | 1 | -3/+3 |
| | | | | | | | | artifacts | ||||
| * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 1 | -38/+17 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 1 | -49/+58 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs | ||||
| * | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions" | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -14/+35 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 1 | -0/+9 |
| |\ \ \ \ \ |