aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-171-32/+10
|\
| * refactor: move common inventory folder version update code to parent class ↵Justin Clark-Casey (justincc)2012-11-151-32/+10
| | | | | | | | in mysql, mssql and sqlite database plugins
* | Merge branch 'master' into careminsterMelanie2012-11-152-7/+142
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Implement folder version updating for the sqlite inventory pluginJustin Clark-Casey (justincc)2012-11-152-7/+142
| |
* | Merge branch 'master' into careminsterMelanie2012-11-1510-299/+306
|\ \ | |/
| * More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where ↵Justin Clark-Casey (justincc)2012-11-149-298/+305
| | | | | | | | | | | | possible. Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
| * Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-131-1/+1
| | | | | | | | have an AssemblyInfo file.
* | Merge branch 'master' into careminsterMelanie2012-11-091-3/+27
|\ \ | |/
| * Update parent inventory folder version numbers when folders are ↵Justin Clark-Casey (justincc)2012-11-091-3/+27
| | | | | | | | | | | | | | | | moved/created/deleted to match version numbers cached by viewers. This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders). This should hopefully improve viewer reuse of its cached inventory information. Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
* | Merge branch 'master' into careminsterMelanie2012-10-231-5/+20
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/LandData.cs
| * SQLite DB: some values of land data will be not saved / loadedPixelTomsen2012-10-211-5/+20
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=6370 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+12
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+13
| |
* | Merge branch 'avination' into careminsterMelanie2012-06-111-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-071-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-272-1/+111
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | 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-232-1/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Use correct casing of RegionSettings.Sandbox in the various database modules.Justin Clark-Casey (justincc)2012-02-291-1/+1
| | | | | | | | | | | | MySQL and MSSQL have it as Sandbox, sqlite as sandbox. In various different places in every plugin the wrong casing is used... Consistency, who needs it? Or one day sqlite can change to Sandbox.
* | 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-152-305/+692
|\ \ | |/
| * 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
* | 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-042-1/+9
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Fix: Covenant changed time not set ↵PixelTomsen2012-02-032-1/+9
| | | | | | | | | | | | 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-6/+6
| | | | | | | | | | | | 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-021-6/+6
| |
* | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-111-20/+0
|\ \ | |/
| * Remove vestigal OpenSim.Data mono addins extension points that don't look ↵Justin Clark-Casey (justincc)2011-09-201-20/+0
| | | | | | | | like they've been active for at least 2 and a half years
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-48/+78
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-161-48/+78
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Resolve merge commits, stage 1Tom2011-09-047-14/+33
|\ \ | |/
| * Remove un-needed ATTACH command in migration script.BlueWall2011-08-151-3/+1
| | | | | | | | | | | | This was causing issues when using specified paths to database files by using a hard-coded name.
| * refactor: Pull up Assembly of the SQLite classes as a protected property, so ↵Marck2011-07-166-11/+32
| | | | | | | | that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 for MySQL -- no functional changes.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-092-2/+12
|\ \ | |/
| * fix bug where generic sqlite table delete wasn't working.Justin Clark-Casey (justincc)2011-05-271-1/+1
| | | | | | | | this would have caused dupe links bugs when using the sqlite adaptor
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-0/+5
| | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
| * Fixed permissions bug related to friends in PermissionsModule. Added ↵Diva Canto2011-05-211-1/+6
| | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-202-6/+32
|\ \ | |/
| * Allow item links to be deleted even when other deletes and purges are disabled.Justin Clark-Casey (justincc)2011-05-192-6/+32
| | | | | | | | | | | | | | If these links are not deleted, then they will build up in the player's inventory until they can no longer log in. Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being accidentally moved. When a link is deleted, the target of the link is never touched. This is a general solution that accounts for the use of links anywhere in the user's inventory.
| * Accidentally committed too earlyJustin Clark-Casey (justincc)2011-05-182-32/+6
| | | | | | | | | | | | Revert "Allow item links to be deleted even when other deletes and purges are disabled." This reverts commit 491279f99afc65860d44765ee7829c7dd5e4e38e.
| * Allow item links to be deleted even when other deletes and purges are disabled.Justin Clark-Casey (justincc)2011-05-172-6/+32
| | | | | | | | | | | | | | If these links are not deleted, then they will build up in the player's inventory until they can no longer log in. Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being accidentally moved. When a link is deleted, the target of the link is never touched. This is a general solution that accounts for the use of links anywhere in the user's inventory.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-082-4/+2
|\ \ | |/
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-05-062-4/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-061-0/+22
|\ \ | |/