UbitUmarov
1113407280
add more calls to effective permissions aggregation; do not change groupmask on deed
2017-01-17 01:22:44 +00:00
UbitUmarov
ffa6c7aae2
avoid lastOwner beeing the group
2017-01-16 19:22:39 +00:00
UbitUmarov
733072b6a3
chance new effective permissions code to ease aggregation on demand( ie on changes). But still doing full aggregation on checks, so still heavy
2017-01-16 19:01:41 +00:00
Melanie Thielker
d78f04b326
Merge branch 'melanie'
2017-01-16 14:55:54 +00:00
Melanie Thielker
568614af2c
Remove the last instance of the legacy slam but being set
...
New objects now get only the real slam bit.
2017-01-16 14:53:42 +00:00
UbitUmarov
b9e2606c2f
add code for fixing effective permitions. This is a test, and currently too slow for prodution. just finding our way home
2017-01-15 16:15:40 +00:00
UbitUmarov
e263730ada
fix: send viewers the Everyone permitions of items inside other objects
2017-01-14 11:25:44 +00:00
Melanie Thielker
f2c50db968
Fix an artefact introduced by git's revert merging logic
2017-01-06 18:13:33 +00:00
Melanie Thielker
4385d7d693
Fix errors introduced by incomplete understanding of what folded perms are
2017-01-06 13:17:43 +00:00
Melanie Thielker
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
UbitUmarov
fa9a4a9a2b
some changes to RequestInventoryFile()
2016-07-09 00:20:51 +01:00
UbitUmarov
a058fca1ac
reduce lock time during object inventory ProcessInventoryBackup
2016-07-07 19:54:52 +01:00
UbitUmarov
668339f936
reduce the initial capacity of InventoryStringBuilder the 16k i added is
...
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"
2016-07-07 16:05:13 +01:00
UbitUmarov
416c02ef3a
hide the footprints of my previus bug ( take out comented code
2016-07-07 15:30:07 +01:00
UbitUmarov
a4fc22a6b6
forget InventoryStringBuilder.close()
2016-07-07 15:22:32 +01:00
UbitUmarov
14b9d31bd9
change InventoryStringBuilder. This will do much for mantis 7904 objects inventory sending is slow by design
2016-07-07 14:38:27 +01:00
Diva Canto
1e9a944633
Revert "More debug to diagnose osgrid"
...
This reverts commit b5f29e93f6
.
2016-06-13 20:39:52 -07:00
Diva Canto
b5f29e93f6
More debug to diagnose osgrid
2016-06-13 20:35:40 -07:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
Justin Clark-Casey (justincc)
d0a2ea0857
Fix regression where the stored state of every second script in an object rezzed from inventory (e.g. attachments) was no longer loaded.
...
Likely a regression since f132f642
(2014-08-28)
Relates to http://opensimulator.org/mantis/view.php?id=7278
2015-01-23 00:27:57 +00:00
UbitUmarov
b4a91f5dde
return bbox and offsetHeight to RezObject
2014-11-19 16:43:56 +00:00
UbitUmarov
a70ed79c39
compile fix
2014-09-21 23:26:17 +01:00
UbitUmarov
d1ccc6d5cc
release lock a bit sooner when not needed, add a try on more complex db
...
store call
2014-09-21 23:23:20 +01:00
UbitUmarov
adda696cd0
protect getting the item
2014-09-21 22:46:44 +01:00
UbitUmarov
51ec2d83ac
remove redundant code
2014-09-21 22:43:17 +01:00
UbitUmarov
ffe5ede550
taskInventory request: give each transfer a diferent filename, Add more
...
agressive lock
2014-09-12 11:48:43 +01:00
UbitUmarov
e1a5a1f829
apply objectSlamSale to all roots of coalescence objects. replace the
...
single object condition for renaming
2014-08-05 23:25:08 +01:00
UbitUmarov
3c321e5bb3
dont mess with names and descriptions on coalescence objects. Inventory
...
name can change for inventory purposes only.
2014-08-05 22:49:41 +01:00
UbitUmarov
2c4908578e
revert to old avn-current code, not using ApplyPermissionsOnRez() till its
...
reviewed/fixed
2014-08-05 21:55:42 +01:00
UbitUmarov
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
Dev Random
4e92b55231
Call RemoveScriptInstance when removing from inventory
2014-07-14 18:06:24 +01:00
Justin Clark-Casey (justincc)
32070fa5f4
minor: remove compiler warning in SceneObjectPartInventory
2014-05-20 23:54:49 +01:00
Melanie
4ccb15290e
Merge branch 'master' into careminster
...
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
2014-01-28 20:47:36 +00:00
Oren Hurvitz
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
Oren Hurvitz
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
Melanie
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
Oren Hurvitz
d0c1780839
Fixed rezzing coalesced objects from a prim's inventory
...
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
2013-10-15 23:59:16 +01:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
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
2013-07-18 10:08:10 +01:00
Diva Canto
67e500383e
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
2013-07-09 14:12:52 -07:00
Melanie
5f4c4df227
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
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"
2013-03-26 03:40:06 +00:00
Melanie
c341664c1b
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
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"
2013-03-24 18:56:28 +01:00
Melanie
a2c6094324
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc)
6235d16c31
Make "show object part" command correctly display script status.
...
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
2012-10-31 00:31:18 +00:00
Melanie
4fe6d8c3a4
Merge branch 'master' into careminster
2012-10-18 23:48:35 +01:00
Justin Clark-Casey (justincc)
a960273e91
Add number of inventory items to information displayed via "show part" console command
2012-10-18 23:02:57 +01:00
Melanie
130668057f
Fix merge artefacts
2012-07-17 01:42:42 +02:00
Melanie
d632fd7124
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-07-12 08:55:16 +01:00
Justin Clark-Casey (justincc)
fc24563206
Add regression TestDetachScriptedAttachmentToInventory()
...
This currently only does a relatively crude check for a ScriptState node in the serialized xml
2012-07-11 21:43:35 +01:00
Melanie
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00