aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-5/+2
|
* bad merge?UbitUmarov2015-09-011-4/+15
|\
| * Merge branch 'master' into careminsterMelanie2013-07-181-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 PermissionMaskMelanie2013-03-241-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 careminsterMelanie2012-07-111-1/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch 'master' into careminsterMelanie2012-06-211-3/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-03-311-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-101-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-261-11/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-121-1/+9
| | | | | | | |
| * | | | | | | Bring us up to date.Tom2011-09-141-0/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-6/+15
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix direct item give permissionsMelanie2011-01-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Make prim inventories a bit more saneMelanie2010-12-211-43/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-34/+26
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * | | | | | | | | | Suppress error messages about scripts not foind if they're in fact disabledMelanie Thielker2010-08-221-0/+3
| | | | | | | | | | |
| * | | | | | | | | | Fix a permissions issueMelanie Thielker2010-07-141-7/+11
| | | | | | | | | | |
| * | | | | | | | | | Revamp the permissions propagation. This MAY mess up. Please test.Melanie Thielker2010-07-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs.
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-1/+11
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Some merge fixupsMelanie2010-01-261-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2010-01-261-5/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵CasperW2009-12-271-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash
* | | | | | | | | | | | | If the owner of an object is taking a copy from the scene (e.g. via the ↵Justin Clark-Casey (justincc)2015-02-031-0/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "take copy" option on a viewer) then only require owner copy perms, not copy and transfer. This matches Linden Lab behaviour and what was already possible via shift-copy. Transfer would not apply here as the owner and copier are the same. This is the only functional change, all other current take copy logic remains the same. Adds regression tests around relevant take copy cases.
* | | | | | | | | | | | Put guards on a bunch of exception-inducing code, as seen in logs from load ↵Diva Canto2013-07-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test.
* | | | | | | | | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-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"
* | | | | | | | | | | When an attachment is detached to inv or derezzed, stop the scripts, update ↵Justin Clark-Casey (justincc)2012-07-101-1/+9
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the known item with script state still in the script engine and then remove the scripts. This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
* | | | | | | | | | Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)2012-06-201-3/+15
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
* | | | | | | | | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵Justin Clark-Casey (justincc)2012-03-311-4/+4
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | the 'root' part.
* | | | | | | | When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-101-0/+2
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
* | | | | | | refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵Justin Clark-Casey (justincc)2012-01-261-11/+4
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | AddInventoryItem() to accept an agent id rather than a full IClientAPI. This stops some code having to make spurious client == null checks and reduces regression test complexity.
* | | | | | Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-131-0/+13
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process. This change ignores those attempts. This stops script failures during login, as the rewearing was racing with the script startup code. It might also help with attachments being abnormally put into deleted state. Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644
* | | | | minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | | | |
* | | | | Fix direct item give permissionsMelanie2011-01-121-1/+1
| | | | |
* | | | | Make prim inventories a bit more saneMelanie2010-12-211-43/+0
| |_|_|/ |/| | |
* | | | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-32/+26
| | | | | | | | | | | | | | | | MapAndArray collection
* | | | Fix a permissions issueMelanie Thielker2010-07-141-7/+11
| | | |
* | | | Revamp the permissions propagation. This MAY mess up. Please test.Melanie2010-07-131-2/+3
| |_|/ |/| | | | | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs.
* | | All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-191-0/+8
| | | | | | | | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable.
* | | Partially implement share with group option for object inventory itemsJustin Clark-Casey (justincc)2010-04-051-1/+3
| |/ |/| | | | | | | | | If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off. If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active. However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
* | Fix a problem where llDie() calls were sometimes leaving dead objects behind.Justin Clark-Casey (justincc)2010-01-251-2/+6
|/ | | | | | | | | | When an object was deleted, the remove script instance call was aggregating the scripting events as normal. This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket) On some occasions, the QuitPacket would be sent before the full update was dequeued and sent. In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5), a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties and cannot be removed from the viewer except by a relog. This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
* Remove the old (Remoting) region crossing code. Fix the new code toMelanie2009-11-261-64/+35
| | | | | | | | | | pass script state and assembly again properly. Reintroduce respecting tht TrustBinaries flag. Changes the interregion protocol! No version bump because it was broken anyway, so with a version mismatch it will simply stay broken, but not crash. Region corssing still doesn't work because there is still monkey business with both rezzed prims being pushed across a border and attached prims when walking across a border. Teleport is untested by may work.
* Remove GetAssemblyName and friends from the SE interface. It's now handledMelanie2009-11-261-88/+5
| | | | internally
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* * Make it possible to store creator strings in user inventory items as well ↵Justin Clarke Casey2009-04-081-1/+1
| | | | | | | | | as UUIDs * All existing functionality should be unaffected. * Database schemas have not been changed.
* Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:Charles Krinke2009-02-221-1/+1
| | | | | | | | | * Added log4net dependency to physxplugin in prebuild.xml. * Added missing m_log fields to classes. * Replaced Console.WriteLine with appropriate m_log.Xxxx * Tested that nant test target runs succesfully. * Tested that local opensim sandbox starts up without errors.
* Fix region crossing for unscripted prims, avoid costly SEHMelanie Thielker2009-02-191-1/+3
|
* Make in-code provisions for the tests. Tests would fail because the Melanie Thielker2009-02-181-1/+14
| | | | | | | | required file system objects are not present in the test harness. This makes the main code ignore the failure, therefore the test succeeds. Not elegant and maybe a unit test guru has a better way. Marked as a TODO
* Fix the windows sharing violations on script crossingsMelanie Thielker2009-02-181-13/+46
|
* Fixes the problem of attachment offset after crossings/TPs. Hopefully it ↵diva2009-02-101-1/+1
| | | | fixes mantis #3126, as well as other random displacements. The problem was that the new object at the receiving region was being marked as attachment before AttachObject was called. That made its AbsolutePosition be the position of the avie, and that was what was being given to AttachObject.
* Moved prim crossing out of OGS1 and into RESTComms and ↵diva2009-02-091-3/+80
| | | | | | | | | | LocalInterregionComms. This breaks interregion comms with older versions in what concerns prim crossing. In the process of moving the comms, a few things seem to be working better, namely this may address mantis #3011, mantis #1698. Hopefully, this doesn't break anything else. But I'm still seeing weirdnesses with attchments jumping out of place after a cross/TP. The two most notable changes in the crossing process were: * Object gets passed in only one message, not two as done before. * Local object crossings do not get serialized, as done before.
generated by cgit v1.1 at 2024-08-23 15:20:04 +0000