aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* store rotation axis locks in MySql and SQlite dbs ( others need to be ↵UbitUmarov2015-10-201-3/+7
| | | | updated also
* put back virtual declarationsUbitUmarov2015-09-281-14/+14
|
* remove virtual declarations master doesnt haveUbitUmarov2015-09-281-14/+14
|
* at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-64/+37
| | | | scenepresence)
* seems to compile ( tests comented out)UbitUmarov2015-09-021-43/+4
|
* bad merge?UbitUmarov2015-09-011-73/+233
|\
| * let mysql be happy with a NULL heighmap ( yeap i made several )UbitUmarov2015-08-251-2/+5
| |
| * fix mySQL ( ignoring other dbs )UbitUmarov2015-08-231-1/+2
| |
| * varregion: refactor use of 'double heightmap[,]' into references to new ↵Robert Adams2015-03-271-27/+39
| | | | | | | | | | | | class TerrainData and push the implementation from Scene into the database readers and writers.
| * remove redundant lockUbitUmarov2014-09-211-1/+2
| |
| * Persist new land fields for access controlMelanie Thielker2014-07-291-2/+14
| |
| * Merge branch 'master' into careminsterMelanie2013-10-041-5/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-06-131-2/+0
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-02-101-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * | | | | Rename Bounciness to RestitutionMelanie2013-02-071-2/+2
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2013-02-051-3/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Check database for root prim IDs only to try and get a handle on prim lossMelanie2012-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | once and for all.
| * | | | | | Merge branch 'master' into careminsterMelanie2012-08-311-219/+238
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | | | | | | Fix and finish the extra parameters storage system for MySQLMelanie2012-08-151-1/+57
| | | | | | | |
| * | | | | | | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+13
| | | | | | | |
| * | | | | | | Merge branch 'avination' into careminsterMelanie2012-07-111-2/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * | | | | | | Fix storing vehicle dataMelanie2012-07-071-2/+2
| | | | | | | | |
| | * | | | | | | Add saving vehicle physics data to the databaseMelanie2012-07-071-2/+17
| | | | | | | | |
| * | | | | | | | Merge branch 'avination' into careminsterMelanie2012-06-291-26/+34
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| | * | | | | | | Prevent bad prim in the database from crashing the sim, list affectedMelanie2012-06-261-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ids and skip them.
| * | | | | | | | Merge branch 'avination' into careminsterMelanie2012-06-111-2/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| | * | | | | | | Typo fixMelanie2012-06-071-3/+5
| | | | | | | | |
| | * | | | | | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-071-0/+31
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into careminsterMelanie2012-05-271-0/+62
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-151-1/+8
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | | | | Port the mel/dahlia fixMelanie2012-05-151-1/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-301-134/+133
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | | | | | | | | Fix an invalid cast that only showed at runtimeMelanie2012-03-201-1/+1
| | | | | | | | | |
| * | | | | | | | | Store and reload extra physics from databaseMelanie2012-03-201-2/+20
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-2/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | * | | | | | | | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-02-041-3/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | | | | | | | | | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-021-8/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-01-301-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | | | | | | | | | | | Correct some SQL syntaxMelanie2012-01-241-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix merge artefacts and build breakMelanie2012-01-241-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-01-241-39/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-231-4/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-221-0/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * | | | | | | | | | | | | | | Spin off terrain save into a new thread and make it so that it uses the oldMelanie2011-12-131-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values for places where NaN are found.
| * | | | | | | | | | | | | | | Don't allow deletion of a terrain from the database unless we have one to ↵Melanie2011-12-051-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace it with
| * | | | | | | | | | | | | | | Bring us up to date.Tom2011-09-141-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Resolve merge commits, stage 1Tom2011-09-041-17/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-22 18:30:40 +0000