aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL (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
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-161-1/+11
| |\
| | * 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.
* | | Remove the core module extra profile settings support carried in with the latestMelanie2014-01-051-2/+2
| | | | | | | | | | | | patches. We don't need it.
* | | Intermediate commit. Sill errors.Melanie2014-01-051-6/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * | Fix issue with editing notes for other avatarsBlueWall2013-12-161-0/+4
| | |
| * | Populate user preferences with UserAccount email if it is present, else ↵BlueWall2013-12-161-6/+10
| |/ | | | | | | return an error indicating no email is on record for the user.
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-072-28/+21
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | Merge branch 'master' into careminsterMelanie2013-12-072-21/+28
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-062-21/+28
| |
* | Merge branch 'master' into careminsterMelanie2013-12-071-2/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Stop writing partner id to record when updating profile data. This should be ↵BlueWall2013-12-051-2/+0
| | | | | | | | changed only by admin in backend.
* | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-10-042-5/+41
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-5/+34
| | | | | | | | | | | | | | | | | | | | 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-09-071-0/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-0/+5
| | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | Merge branch 'master' into careminsterMelanie2013-07-291-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * This makes group search work (Groups V2).Diva Canto2013-07-281-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-07-182-0/+98
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-0/+11
| |
| * HG UAS: Moved hg-session data from memory to DB storage. This makes it so ↵Diva Canto2013-07-142-0/+87
| | | | | | | | 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-042-3/+6
|\ \ | |/
| * 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.
| * Fix SQL statementDiva Canto2013-07-021-1/+1
| |
| * Really make it call the method with the query interfaceDiva Canto2013-07-021-1/+1
| |
| * This should have a strong effect on the Unknown User issue mantis #6625Diva Canto2013-07-021-2/+5
| |
* | Merge branch 'master' into careminsterMelanie2013-06-302-1/+3
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * In XAssetService, on a delete asset request also delete the asset in any ↵Justin Clark-Casey (justincc)2013-06-281-0/+2
| | | | | | | | | | | | chained service. This eliminates the async migration since it causes a race condition with the "delete asset" console command
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-271-1/+1
| | | | | | | | | | | | | | | | This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc. All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace. This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors. This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release. However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
* | Merge branch 'master' into careminsterMelanie2013-06-131-2/+0
|\ \ | |/
| * * This fixes having to select and deselect prim to get keyframemotion to ↵teravus2013-06-121-2/+0
| | | | | | | | start running when pulled from data storage.
| * Database persistence for keyframes. Contains a Migration.Melanie2013-06-062-4/+32
| |
* | Merge branch 'master' into careminsterMelanie2013-06-042-0/+1179
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding standard OpenSim header to source filesBlueWall2013-05-311-0/+27
| |
| * Fill in fields with default values on profile creationBlueWall2013-05-311-2/+48
| |
| * UserProfilesBlueWall2013-05-302-0/+1106
| | | | | | | | 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-04-291-5/+2
|\ \ | |/
| * Fix wrong sql statement in offline im.Diva Canto2013-04-281-5/+2
| |
| * Recover a lost "virtual". Downstream projects need this.Diva Canto2013-04-251-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-04-101-8/+14
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * minor: Make exceptions thrown by MySQLAssetData more consistent.Justin Clark-Casey (justincc)2013-04-101-10/+19
| |
* | Merge branch 'master' into careminsterMelanie2013-03-152-91/+108
|\ \ | |/ | | | | | | | | 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-152-62/+60
| | | | | | | | | | | | | | | | 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.
| * Implement access time updates on assets for XAssetService.Justin Clark-Casey (justincc)2013-03-151-38/+57
| | | | | | | | | | | | | | | | This only happens if access time is older than 30 days currently, in order to reduce database updates. The idea is to give some idea of assets which haven't been accessed for a very, very long time. These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain. This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself. And many metadata entries may point to the same data. Probably need to address this.
* | Merge branch 'master' into careminsterMelanie2013-02-282-4/+12
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Add more information to warnings logged when asset names and descriptions ↵Justin Clark-Casey (justincc)2013-02-272-4/+12
| | | | | | | | | | | | | | have to be truncated for database storage On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are. Even though they are never subsequently (inventory names/descriptions are always used instead).
generated by cgit v1.1 at 2024-12-19 12:17:36 +0000