aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/Resources (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-281-1/+11
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * In the offline message table, store the sender.Oren Hurvitz2014-01-161-1/+11
| | | | | | | | This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-10/+0
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | Merge branch 'master' into careminsterMelanie2013-12-071-0/+10
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+10
| |
* | Merge branch 'master' into careminsterMelanie2013-10-041-0/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+10
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
* | Merge branch 'master' into careminsterMelanie2013-07-181-0/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-141-0/+1
| |
| * HG UAS: Moved hg-session data from memory to DB storage. This makes it so ↵Diva Canto2013-07-141-0/+17
| | | | | | | | that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only.
* | Merge branch 'master' into careminsterMelanie2013-07-041-1/+1
|\ \ | |/
| * HG Friends: migration #3 is failing on some installations of MySql. Setting ↵Diva Canto2013-07-041-1/+1
| | | | | | | | the table to InnoDB seems to fix the problem.
| * Database persistence for keyframes. Contains a Migration.Melanie2013-06-061-0/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-06-041-0/+83
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * UserProfilesBlueWall2013-05-301-0/+83
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | Merge branch 'master' into careminsterMelanie2013-05-111-0/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Send up the part missing from the Avination Estate commit.Melanie2013-05-111-0/+6
| | | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-03-151-15/+15
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Change the table and field names of XAssetService mysql db tables to be ↵Justin Clark-Casey (justincc)2013-03-151-15/+15
| | | | | | | | | | | | | | | | capitalized like Avatars, Friends, etc. Also fixes access time being set on assets rather than XAssetsMeta This is to try and be somewhat consistent with other service tables that are mainly in this style. No migration is supplied, since nobody should be using this service yet except on a test basis.
* | Merge branch 'master' into careminsterMelanie2013-02-222-0/+139
|\ \ | |/
| * First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-191-0/+115
| | | | | | | | rest to Addons.Groups.dll.
| * Offline IM: moved the Data and MySQL bits to the corresponding places in ↵Diva Canto2013-02-191-0/+24
| | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
* | Merge branch 'master' into careminsterMelanie2013-02-101-0/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * Added physics parameters support to MSSQL and SQLite (not tested)Oren Hurvitz2013-02-091-1/+1
| |
| * Partial port of Avination's support for the new physics parameters.Melanie2013-02-061-0/+13
| | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* | Merge branch 'master' into careminsterMelanie2013-02-051-0/+8
|\ \ | |/ | | | | | | | | | | | | 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
| * Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-251-1/+0
| |
| * Implement dynamic attribute persistence on mysql and mssqlJustin Clark-Casey (justincc)2013-01-251-0/+9
| | | | | | | | mssql is untested
* | Merge branch 'master' into careminsterMelanie2012-09-291-3/+0
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Removed the bits about the TOSModule. That module doesn't go into core. ↵Diva Canto2012-09-271-3/+0
| | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there.
* | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-0/+8
|\ \ | |/
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-251-0/+8
| |
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+7
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+7
| |
* | Merge branch 'master' into careminsterMelanie2012-05-271-0/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-03-091-0/+27
|\ \ | |/
| * Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-061-2/+2
| | | | | | | | | | | | | | Some successful collision attacks have been carried out on sha1 with speculation that more are possible. http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future. Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
| * Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-021-0/+27
| | | | | | | | | | | | | | This is an extremely crude implemenation which almost works by accident. Nevertheless it does work. It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing It does not interact at all with the existing asset service or any data stored there. This code is subject to change without notice and should not be used for anything other than gawking.
* | Merge branch 'master' into careminsterMelanie2012-02-041-0/+20
|\ \ | |/ | | | | | | | | 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-031-0/+5
| | | | | | | | | | | | 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-021-0/+6
| | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | 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-301-0/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-301-0/+6
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | Merge branch 'master' into careminsterMelanie2012-01-241-12/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * 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-221-1/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
generated by cgit v1.1 at 2024-10-20 12:33:44 +0000