aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Give extra info on the call stack when SQL errors happenMelanie Thielker2014-08-091-0/+1
|
* Persist new land fields for access controlMelanie Thielker2014-07-291-2/+14
|
* Merge branch 'master' into careminsterMelanie2014-01-282-2/+13
|\ | | | | | | | | | | | | | | 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-162-2/+13
| |\
| | * In the offline message table, store the sender.Oren Hurvitz2014-01-162-2/+13
| | | | | | | | | | | | 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-052-2/+4
| | | | | | | | | | | | patches. We don't need it.
* | | Intermediate commit. Sill errors.Melanie2014-01-052-6/+98
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-162-7/+12
| |/ | | | | | | return an error indicating no email is on record for the user.
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-077-148/+36
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | Merge branch 'master' into careminsterMelanie2013-12-077-36/+148
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-067-36/+148
| |
* | Merge branch 'master' into careminsterMelanie2013-12-074-7/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Adding profile partners fix to SQLite and PgSQL driversBlueWall2013-12-052-4/+0
| |
| * Stop writing partner id to record when updating profile data. This should be ↵BlueWall2013-12-051-2/+0
| | | | | | | | changed only by admin in backend.
| * Reversing back to the row["ColumnName"] case field name. ↵Fernando Oliveira2013-12-061-1/+1
| | | | | | | | http://opensimulator.org/mantis/view.php?id=6868
| * Corrected case to get columns from Regions table from PostgreSQL ↵Fernando Oliveira2013-11-251-2/+2
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=6865 Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
* | Merge branch 'master' into careminsterMelanie2013-11-231-4/+5
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Fixed the update StoreRegionWindlightSettings() wasn't updating ↵Fernando Oliveira2013-11-221-4/+5
| | | | | | | | | | | | | | regionwindlight table, raising PrimaryKey violation; Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br> Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
* | Merge branch 'master' into careminsterMelanie2013-11-0340-0/+11992
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Corrected estateID to EstateID on getEstates function at PGSQLEstateData.csFernando Oliveira2013-10-161-1/+1
| |
| * * One More thing, add an appdomain data element to ensure that we don't ↵Fernando Oliveira2013-10-162-4/+15
| | | | | | | | duplicate the assembly resolving.
| * * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - ↵Fernando Oliveira2013-10-162-0/+47
| | | | | | | | Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
| * * Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)fernando2013-10-154-9/+40
| | | | | | | | * Please test
| * Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.Fernando Oliveira2013-10-1240-0/+11892
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added PostGreSQL support * Added MySQL/MySQLXGroupData.cs * PostgreSQL data access implementation * PostgreSQL dll binarie and RegionStore.migrations * Migrations Scripts from MSSQL to POSTGRES * Postgres SQL Type fixes * Postgres SQL Connection string * Data type issues * more fixes * tests and +tests * UUID x string - FIGHT! * Fixed PG types to internal csharp types * More data type fix (PostgreSQL fields are case sensitive) :( * more field case sensitive fixes * changed the migration files to be case sensitive for fields. * fixed fields case * finished converting, now search for hidden bugs. * some more fixes * bool type fixed * more case fixes; * creatorID case fixed * case fields fixed * fixed default now() for TMStamp fields with don't allow nulls. * fix case sensitve for Region name and Estate name * fixed case for names for search * fix class name Error * Bug fixed on select and migrations * Un-Reverting my change due to Postgres issue with the ILIKE function * Fixed some issued for Diva Distro * Fixes for integration with Diva Distro * Added System.Core to prebuild.xml for PG project * Configured to make DIff for Push to OpenSim Project * Diffs only to PostgreSQL mods.
* | Merge branch 'master' into careminsterMelanie2013-10-065-5/+5
|\ \ | |/ | | | | | | | | 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-045-5/+5
| |
* | Merge branch 'master' into careminsterMelanie2013-10-046-9/+94
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-226-9/+87
| | | | | | | | | | | | | | | | | | | | 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-074-0/+16
|\ \ | |/ | | | | | | | | 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-024-0/+16
| | | | | | | | | | | | | | | | | | | | 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-242-13/+27
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Fix HGTravelStore.migrations in SQLite (mantis #6709)Diva Canto2013-07-191-10/+10
| |
| * Enable storing of environment settings in NullSimulationDataDan Lake2013-07-181-3/+17
| |
* | Merge branch 'master' into careminsterMelanie2013-07-186-7/+278
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Added SQLite version of hg travel data store. UNTESTED. Hope it works!Diva Canto2013-07-142-0/+100
| |
| * Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-143-0/+12
| |
| * HG UAS: Moved hg-session data from memory to DB storage. This makes it so ↵Diva Canto2013-07-143-0/+145
| | | | | | | | 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.
| * Enhance NullEstateData to remember stored estate values and returnRobert Adams2013-07-111-7/+21
| | | | | | | | | | them next time asked. This keeps any estate settings from being reset when the estate dialog is opened in a region with null estate storage.
* | Merge branch 'master' into careminsterMelanie2013-07-045-4/+17
|\ \ | |/
| * 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-023-3/+3
| |
| * Do the same for SQLite and MSSQLDiva Canto2013-07-022-2/+2
| |
| * 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-024-3/+16
| |
* | Merge branch 'master' into careminsterMelanie2013-06-304-3/+5
|\ \ | |/ | | | | | | | | | | 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-273-3/+3
| | | | | | | | | | | | | | | | 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.
generated by cgit v1.1 at 2024-11-06 19:40:52 +0000