aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-161-14/+0
|\
| * Revert "Fix script "Running" behavior"Melanie2012-07-161-14/+0
| | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | Merge branch 'master' into careminsterMelanie2012-06-261-0/+14
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix script "Running" behaviorBlueWall2012-06-231-0/+14
| | | | | | | | Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
* | Merge branch 'master' into careminsterMelanie2012-06-211-4/+17
|\ \ | |/ | | | | | | | | | | | | 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
| * Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)2012-06-201-4/+17
| | | | | | | | | | | | started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
* | Merge branch 'master' into careminsterMelanie2012-06-071-17/+12
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-071-17/+12
| | | | | | | | Also change code to grab the agent asset transaction module once.
* | Merge branch 'master' into careminsterMelanie2012-05-271-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-5/+5
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-141-1/+4
|\ \
| * | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-101-0/+4
|\ \ \ | |/ / |/| / | |/
| * Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-0/+4
| | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
| * Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-251-1/+1
| | | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior.
* | Merge branch 'master' into careminsterMelanie2012-04-071-13/+68
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| |
| * refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵Justin Clark-Casey (justincc)2012-03-221-11/+8
| | | | | | | | MoveTaskInventoryItem()
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-5/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Fix llGiveInventory() so that it checks the destination part for ↵Justin Clark-Casey (justincc)2012-03-221-5/+5
| | | | | | | | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case.
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+1
|\ \ | |/
| * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+9
|\ \ | |/
| * Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
| | | | | | | | This is a valid check because the caller could supply an invalid uuid.
* | Merge branch 'master' into careminsterMelanie2012-02-211-16/+2
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-11/+1
| | | | | | | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569
| * Revert "Fix:Cannot drag inventory from child prim into inventory ↵Justin Clark-Casey (justincc)2012-02-211-8/+4
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way.
* | Merge branch 'master' into careminsterMelanie2012-02-211-4/+8
|\ \ | |/
| * Fix:Cannot drag inventory from child prim into inventory ↵PixelTomsen2012-02-211-4/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5569
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+13
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Add new and updated script eventsRobert Adams2012-02-171-0/+12
| |
| * Fix: Object owned by the group does not return to the last owner ↵PixelTomsen2012-02-161-1/+1
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5404
* | Merge branch 'master' into careminsterMelanie2012-02-101-0/+9
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-101-0/+9
| | | | | | | | | | | | | | | | 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
* | Merge branch 'master' into careminsterMelanie2012-02-091-2/+19
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-081-2/+19
| | | | | | | | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878
* | Merge branch 'master' into careminsterMelanie2012-02-041-4/+19
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵Justin Clark-Casey (justincc)2012-02-041-20/+19
| | | | | | | | | | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873
* | Merge branch 'master' into careminsterMelanie2012-01-281-2/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Comment out xfer section in Scene.UpdateTaskInventory() which was causing ↵Justin Clark-Casey (justincc)2012-01-281-13/+20
| | | | | | | | | | | | | | | | | | spurious errors and "script saved" messages when script properties were changed. Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes. It's unknown whether the commented out code was working for very old viewers or not. Code is commented out to reduce complexity and so that useful error messages don't need to be removed. If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
* | Merge branch 'master' into careminsterMelanie2012-01-261-0/+11
|\ \ | |/
| * Add basic TestAddScript() regression testJustin Clark-Casey (justincc)2012-01-261-0/+11
| |
* | Merge branch 'master' into careminsterMelanie2012-01-261-78/+104
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵Justin Clark-Casey (justincc)2012-01-261-20/+30
| | | | | | | | | | | | 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.
| * refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵Justin Clark-Casey (justincc)2012-01-251-79/+95
| | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim()
| * If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-16/+39
| | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof.
* | If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-5/+24
| | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof.
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-101-0/+4
| |
* | Merge branch 'master' into careminsterMelanie2011-12-091-4/+6
|\ \ | |/
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵Justin Clark-Casey (justincc)2011-12-091-4/+6
| | | | | | | | | | | | it doesn't trigger an exception if the item hasn't been found. In this situation we will now put out a slightly more meaningful log error message instead.
generated by cgit v1.1 at 2024-12-25 19:14:28 +0000