aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Make the "All Estates" option work from the client (this makes chosen ↵Justin Clark-Casey (justincc)2011-04-051-0/+22
| | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy!
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-0/+32
|\ \ | |/
| * On initial region registration, if the user chooses the option to make the ↵Justin Clark-Casey (justincc)2011-03-211-0/+32
| | | | | | | | region part of an existing estate, then list the existing region names.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-121-6/+0
|\ \ | |/
| * In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row ↵Justin Clark-Casey (justincc)2011-02-111-6/+0
| | | | | | | | | | | | | | | | from the data adaptor's Rows list in addition to calling Delete. This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication). Probably a holdover from copying code from the older legacy adaptor. Resolves http://opensimulator.org/mantis/view.php?id=5361
* | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-251-0/+5
| | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-231-0/+3
|\ \ | |/
| * Fix joining land parcels not being stored correctly in SQLite. Thank you to ↵Marck2010-11-231-0/+3
| | | | | | | | goetz for the initial patch in Mantis #5230.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-6/+6
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-212-4/+4
| | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
| * Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of ↵Diva Canto2010-11-211-2/+2
| | | | | | | | SOP.CreatorID. Untested, but should work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+3
|\ \ | |/
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-031-0/+3
| | | | | | | | from a region and allow normal day cycles to be reestablished
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-2512-15/+72
|\ \ | |/
| * * One more item for CSharpSqliteTeravus Ovares (Dan Olivares)2010-09-231-3/+10
| | | | | | | | | | | | | | * Hopefully this will enable mac people to use SQLite again * Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up. * There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after. * The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
| * * Add CSharpSqlite to prebuildTeravus Ovares (Dan Olivares)2010-09-2312-12/+62
| | | | | | | | | | | | | | | | | | | | * Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite #if CSharpSqlite using Community.CsharpSqlite.Sqlite; #else using Mono.Data.Sqlite; #endif * Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-1/+1
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
generated by cgit v1.1 at 2024-11-08 16:09:14 +0000