aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-02-217-0/+20
|\ | | | | | | Conflicts:
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-217-0/+20
| |
* | Merge branch 'master' into careminsterMelanie2012-02-182-1/+128
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Parcel sales support to SQLiteBlueWall2012-02-172-1/+10
| |
| * Fillin missing SQLite support for TelehubsBlueWall2012-02-172-0/+118
| |
* | Merge branch 'master' into careminsterMelanie2012-02-153-306/+700
|\ \ | |/
| * Fix: Lightshare Module(Windlight)-Region settings are not applicable for ↵PixelTomsen2012-02-142-305/+692
| | | | | | | | database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
| * Fix: MSSQLDB Grid - unable to register region ↵PixelTomsen2012-02-141-1/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5886
| * Revert "Add GridStore migration for MSSQL."Justin Clark-Casey (justincc)2012-02-141-8/+0
| | | | | | | | This reverts commit 0b17a66e683f7ffca3877c1601c4179684b62144.
| * Add GridStore migration for MSSQL.Justin Clark-Casey (justincc)2012-02-141-0/+8
| | | | | | | | This is done blind since I don't use MSSQL. If this doesn't work, then one will have to wait for it to be updated for the 0.7.3 opensim release.
* | Merge branch 'master' into careminsterMelanie2012-02-101-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Fix: Unable to remove AV from friend list (sqldb-bug) ↵PixelTomsen2012-02-101-1/+1
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3731
* | Merge branch 'master' into careminsterMelanie2012-02-046-8/+46
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add default value to TelehubObjectBlueWall2012-02-041-0/+10
| |
| * Fix: Covenant changed time not set ↵PixelTomsen2012-02-036-8/+31
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-024-20/+27
| | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-023-20/+21
| |
* | Merge branch 'master' into careminsterMelanie2012-01-301-0/+9
|\ \ | |/
| * Add the needed column in the regions table and a few tweaks.Melanie2012-01-301-0/+9
| | | | | | | | | | Warning: Contains a Migration Warning: Cannot guarantee nut free
* | Merge branch 'master' into careminsterMelanie2012-01-302-2/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-302-2/+10
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | Completely disable NPC being sensed as agents, the abuse potential is too greatMelanie2012-01-281-1/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-01-261-6/+6
|\ \ | |/ | | | | | | | | 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-6/+6
| | | | | | | | | | | | 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.
| * Add a forgotten parameterMelanie2012-01-241-1/+1
| |
* | Correct some SQL syntaxMelanie2012-01-241-1/+1
| |
* | Fix merge artefacts and build breakMelanie2012-01-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-242-51/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-241-40/+13
| | | | | | | | additional redundant information.
| * IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since theMelanie2012-01-231-12/+3
| | | | | | | | | | | | Telehub commits! They will eat your babies and corrupt your database while they munch. DO NOT use anything from the first Telehub commit to this one. FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
* | Merge branch 'master' into careminsterMelanie2012-01-231-4/+35
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Fix up some parameter namingMelanie2012-01-221-2/+2
| |
| * Finish connecting Telehub to databaseBlueWall2012-01-221-3/+19
| |
| * Hooking up new telehub data to the databaseBlueWall2012-01-221-0/+14
| |
* | Merge branch 'master' into careminsterMelanie2012-01-223-2/+95
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Change the key name I missed in last commitMelanie2012-01-221-1/+1
| |
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-224-87/+95
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * Telehub Support:BlueWall2012-01-212-1/+86
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | 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.
* | Merge branch 'master' into bigmergeMelanie2011-12-051-9/+31
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-9/+31
| | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected.
* | Don't allow deletion of a terrain from the database unless we have one to ↵Melanie2011-12-051-7/+21
| | | | | | | | replace it with
* | Merge branch 'master' into bigmergeMelanie2011-11-191-0/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+2
| | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly
| * Remove mono compiler warnings. Fix problem with co-ordinate given in ↵Justin Clark-Casey (justincc)2011-11-191-5/+5
| | | | | | | | deregister region message
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-191-0/+20
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
* | Merge branch 'master' into bigmergeMelanie2011-11-141-1/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-1/+9
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-031-5/+0
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-11-18 14:56:44 +0000