aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* dont change agentItem.BasePermissions where avination-current didn'tUbitUmarov2014-08-051-2/+3
| | | | change
* replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-5/+6
| | | | artifacts
* fix attachmentsUbitUmarov2014-07-191-7/+9
|
* Merge branch 'master' into careminsterMelanie2014-01-281-7/+10
|\ | | | | | | | | | | | | | | 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
| * Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-101-7/+10
| | | | | | | | its main permissions
* | Merge branch 'master' into careminsterMelanie2013-11-031-22/+113
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-22/+97
| | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
* | Merge branch 'master' into careminsterMelanie2013-10-041-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+7
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
| * Reinsert comments about possible race conditions when sending bulk inventory ↵Justin Clark-Casey (justincc)2013-09-161-0/+3
| | | | | | | | updates on non-flag clothing editing
* | Merge branch 'master' into careminsterMelanie2013-08-181-4/+16
|\ \ | |/
| * Allow updating the wearable type of wearables that have a type of 0.Melanie2013-08-181-4/+16
| | | | | | | | This will allow viewers to fix broken wearables as they detect them.
* | Merge branch 'master' into careminsterMelanie2013-08-071-0/+6
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * More on HG inventory and OutboundPermission: disallowing giving inventory to ↵Diva Canto2013-08-031-0/+3
| | | | | | | | foreigners if OutboundPermission is false
| * HG: If OutboundPermission is set to false, let's enforce stricter ↵Diva Canto2013-08-031-0/+3
| | | | | | | | permissions by not allowing objects to be taken to inventory.
* | Merge branch 'master' into careminsterMelanie2013-07-241-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Don't post Link asset types back to the home gridDiva Canto2013-07-231-2/+2
| |
| * Fix other places when saving scripts or notecards in prim inventories where ↵Justin Clark-Casey (justincc)2013-06-181-5/+5
| | | | | | | | messages should be transient without an OK button
* | Merge branch 'master' into careminsterMelanie2013-05-161-3/+3
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Comment out some debugging item permission messages since these are highly ↵Justin Clark-Casey (justincc)2013-05-141-3/+3
| | | | | | | | | | | | noisy on the console. Please re-enable when required
* | Merge branch 'master' into careminsterMelanie2013-05-111-1/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | | | | | | | | | This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction. This looks to address http://opensimulator.org/mantis/view.php?id=6600
| * Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-311-3/+43
| | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-3/+4
| | | | | | | | 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"
* | Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-311-3/+43
| | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-3/+4
| | | | | | | | 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 careminsterMelanie2013-01-271-6/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-5/+6
| | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid. Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-3/+23
| | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
| * Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-161-23/+3
| | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-3/+23
| | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
* | JustinCC's core re-mergeMelanie2013-01-161-3/+23
| |
* | Merge branch 'master' into careminsterMelanie2012-12-161-6/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Switched the order by which foreign inventory and foreign assets are brought ↵Diva Canto2012-12-091-6/+4
| | | | | | | | in, to avoid race conditions on the client.
| * UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
| | | | | | | | Inventory transfers: don't do async on asset transfers or now.
* | Merge branch 'master' into careminsterMelanie2012-11-111-2/+13
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() ↵Justin Clark-Casey (justincc)2012-11-101-2/+13
| | | | | | | | | | | | | | and make it compile again Not currently in test suite since not yet working. Also add method doc to Scene.DeRezObjects()
* | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \
| * | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
| | | | | | | | | | | | Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
* | | Merge branch 'avination' into careminsterMelanie2012-10-171-0/+6
|\ \ \ | |/ /
| * | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-0/+6
| | | | | | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August.
* | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-4/+15
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Add the option to have variable costing for uploadsMelanie2012-09-111-2/+2
| | |
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-1/+1
|\ \ \ | | |/ | |/|
| * | Log initial script startup info notice when xengine actually starts to do ↵Justin Clark-Casey (justincc)2012-08-251-1/+1
| | | | | | | | | | | | this for debugging purposes, rather than before it actually starts to do this.
* | | Merge branch 'master' into careminsterMelanie2012-08-241-0/+3
|\ \ \ | |/ / | | / | |/ |/|
generated by cgit v1.1 at 2025-01-07 03:49:32 +0000