aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance (follow)
Commit message (Collapse)AuthorAgeFilesLines
* make sure XEngine does release script events when a script is destroyedUbitUmarov2019-08-011-0/+3
|
* Xengine: exclude a few more events from mineventdelayUbitUmarov2019-02-201-1/+3
|
* Xengine: don't lose state change eventsUbitUmarov2019-02-201-1/+1
|
* a few more changesUbitUmarov2018-11-261-2/+2
|
* show prim ID on script errorUbitUmarov2018-11-261-0/+1
|
* code aestheticsUbitUmarov2018-11-171-18/+9
|
* remove more xml things no longer needed on .net >4.5.2UbitUmarov2018-01-171-1/+0
|
* shut up some pesty warningsUbitUmarov2018-01-151-1/+0
|
* disable some XmlResolverUbitUmarov2018-01-041-0/+1
|
* Revert "Allow OSSL scripts to softfail"Melanie Thielker2017-01-071-22/+19
| | | | | | | This reverts commit e5244fe70830d6c9ece23d26039d5cbabe9ce9ff. Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
* Fix a compile issue and reintroduce the "GOD" script optionMelanie Thielker2017-01-071-22/+22
|
* Allow OSSL scripts to softfailMelanie Thielker2017-01-071-0/+3
|
* Massive tab and trailing space cleanupMelanie Thielker2017-01-053-67/+67
|
* replace datetime.now on just timming by faster utcnowUbitUmarov2016-11-221-2/+2
|
* change display and log of normal script errorsUbitUmarov2016-11-081-20/+47
|
* Xengine: try to reduce memory pressure of scripts compile. Still ugly code, ↵UbitUmarov2016-08-311-2/+0
| | | | possible mistakes, but i need to share it before i loose it :) )
* add a missing lock()UbitUmarov2016-08-211-1/+2
|
* avoid telling a work job to cancel itselfUbitUmarov2016-08-191-2/+9
|
* do not enqueue next event processing if script is in SelfDelete stateUbitUmarov2016-08-191-3/+4
|
* Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵Diva Canto2016-02-211-1/+1
| | | | replace anymore.
* On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* fix missing clear of queued timer even and state transition flags on ↵UbitUmarov2015-10-011-0/+7
| | | | scripts reset
* fix missing proprieties get, etcUbitUmarov2015-09-081-8/+10
|
* seems to compile ( tests comented out)UbitUmarov2015-09-021-147/+3
|
* bad merge?UbitUmarov2015-09-011-31/+179
|\
| * Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-061-1/+1
| |\ | | | | | | | | | careminster
| | * * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-09-161-1/+2
| | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)
| * | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * \ \ Merge branch 'avination-current' into careminsterMelanie2013-09-161-0/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| | * | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
| * | | Merge branch 'master' into careminsterMelanie2013-08-131-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-07-181-2/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-011-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-101-1/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | | | | | Merge branch 'master' into careminsterMelanie2013-02-271-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-121-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-311-14/+151
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-242-2/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-242-41/+307
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-161-0/+157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * | | | | | | | | | | | | | JustinCC's core re-mergeMelanie2013-01-161-28/+80
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-12-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-12-161-9/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-12-071-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-191-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-162-20/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2024-12-26 00:25:04 +0000