aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* inventory messUbitUmarov2015-09-111-22/+22
|
* remove diva's inventory cache since it seems to cause mantis 7720, broken ↵UbitUmarov2015-09-111-22/+22
| | | | items UUID. Guess it doesn't cover all paths
* seems to compile ( tests comented out)UbitUmarov2015-09-021-112/+34
|
* bad merge?UbitUmarov2015-09-011-88/+426
|\
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-8/+3
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * change/fix rez position and rotation on llRezObject and llRezAtRootUbitUmarov2014-11-271-2/+49
| |
| * fix rez position being for root or center for a single object caseUbitUmarov2014-11-191-0/+22
| |
| * some steps to rez center or root of prim inventory object at requestedUbitUmarov2014-11-191-2/+3
| | | | | | | | position ( does nothing diferent still )
| * return bbox and offsetHeight to RezObjectUbitUmarov2014-11-191-2/+4
| |
| * remove duplicated linesUbitUmarov2014-11-081-3/+0
| |
| * Merge branch 'avination-current'Melanie Thielker2014-10-301-1/+1
| |\
| | * Fix a script load issueMelanie Thielker2014-10-301-1/+1
| | |
| * | Fix an obscure permissions exploit. Taking items from a friend's prim couldMelanie Thielker2014-10-161-6/+4
| | | | | | | | | | | | possibly result in a privilege escalation
| * | bug fix: revert back check on creating linkUbitUmarov2014-10-041-4/+4
| | |
| * | refuse to do a inventory link if provided asset type is not a link orUbitUmarov2014-09-261-0/+4
| | | | | | | | | | | | folderlink
| * | remove debug msgsUbitUmarov2014-09-261-5/+0
| | |
| * | debug msgUbitUmarov2014-09-261-0/+5
| | |
| * | limit number of prims on physical objects. Not all cases covered stillUbitUmarov2014-09-081-0/+5
| | |
| * | 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
| * \ \ 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
| * \ \ \ 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
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-181-4/+16
| |\ \ \ \ \
| * \ \ \ \ \ 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
| * \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ 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
| * | | | | | | | | 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
| * | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-241-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-231-0/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix group return stuffMelanie2012-08-211-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-08-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-281-23/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
generated by cgit v1.1 at 2024-12-22 05:51:34 +0000