http://cia.vc/stats/author/melanie58040206637102 CIA Perl client for Git 1.0 careminster ubitwork 1337616727 melanie d69f197a5d89 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs Fix setting positions of attachments. The recent security fix regarding prim entry messed it up. CIA Perl client for Git 1.0 careminster ubitwork 1337616728 melanie 7305d2e0ef84 OpenSim/Region/Framework/Scenes/CollisionSounds.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs Merge branch 'ubitwork' into avination CIA Perl client for Git 1.0 careminster ubitwork 1337616727 melanie 24b35b7e9375 OpenSim/Region/Framework/Scenes/CollisionSounds.cs Merge branch 'ubitwork' into avination Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs CIA Perl client for Git 1.0 careminster ubitwork 1337616726 melanie 511fc663a24d OpenSim/Region/Framework/Scenes/CollisionSounds.cs Temprorarily disable collision sounds until we have some sound bites CIA Perl client for Git 1.0 careminster avination 1337585754 melanie 7305d2e0ef84 OpenSim/Region/Framework/Scenes/CollisionSounds.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs Merge branch 'ubitwork' into avination CIA Perl client for Git 1.0 careminster 1337432175 melanie 768e4951476d OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs OpenSim/Region/RegionCombinerModule/RegionConnections.cs Merge branch 'master' into careminster CIA Perl client for Git 1.0 careminster 1337432174 melanie ebd9d2618bc8 OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/OdePlugin/ODECharacter.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/InventoryService/XInventoryService.cs OpenSim/Tools/pCampBot/pCampBot.cs bin/OpenSim.ini.example bin/OpenSimDefaults.ini bin/pCampBot.exe.config Merge branch 'master' into careminster Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs CIA Perl client for Git 1.0 careminster avination 1337431128 melanie d69f197a5d89 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs Fix setting positions of attachments. The recent security fix regarding prim entry messed it up. CIA Perl client for Git 1.0 careminster avination 1337293987 melanie 24b35b7e9375 OpenSim/Region/Framework/Scenes/CollisionSounds.cs Merge branch 'ubitwork' into avination Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs CIA Perl client for Git 1.0 careminster avination 1337290788 melanie 511fc663a24d OpenSim/Region/Framework/Scenes/CollisionSounds.cs Temprorarily disable collision sounds until we have some sound bites CIA Perl client for Git 1.0 careminster 1337259287 melanie b4cd8b491bc5 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/CollisionSounds.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs Merge branch 'avination' into careminster CIA Perl client for Git 1.0 careminster 1337258907 melanie 34f20b7fe380 OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs OpenSim/Tests/Common/TestHelpers.cs bin/OpenSim.ini.example Merge branch 'master' into careminster CIA Perl client for Git 1.0 careminster 1337169625 melanie 597f99bca7f0 OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs OpenSim/Tests/Common/Helpers/SceneHelpers.cs bin/Ionic.Zip.dll Merge branch 'master' into careminster CIA Perl client for Git 1.0 careminster 1337114627 melanie e9e797b6814b OpenSim/Region/Framework/Scenes/SceneObjectPart.cs Fix an omission CIA Perl client for Git 1.0 careminster 1337114632 melanie 81ce169dfe4c OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs Merge branch 'avination' into careminster Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs CIA Perl client for Git 1.0 careminster 1337114629 melanie 995cd25f3027 OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs Port the mel/dahlia fix CIA Perl client for Git 1.0 careminster 1337114628 melanie ebdbaba61585 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs Merge branch 'ubitwork' into avination CIA Perl client for Git 1.0 careminster 1337114318 melanie a36c487c791b OpenSim/Region/Framework/Scenes/SceneObjectPart.cs Merge branch 'master' into careminster Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs CIA Perl client for Git 1.0 careminster 1337114317 melanie 65e1d7b2d7a9 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs Guard against null root part on SQLite. This really needs to be fixed so SQLite loads roots before children like MySQL does. CIA Perl client for Git 1.0 careminster 1337114317 melanie 069bcd45e517 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs Try to fix sqlite breakage