aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove the core module extra profile settings support carried in with the latestMelanie2014-01-051-0/+2
| | | | patches. We don't need it.
* Intermediate commit. Sill errors.Melanie2014-01-051-0/+84
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Populate user preferences with UserAccount email if it is present, else ↵BlueWall2013-12-161-1/+2
| | | | | | | | return an error indicating no email is on record for the user.
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-072-95/+0
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | Merge branch 'master' into careminsterMelanie2013-12-072-0/+95
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-062-0/+95
| |
* | 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
| * Adding profile partners fix to SQLite and PgSQL driversBlueWall2013-12-051-2/+0
| |
* | 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-0/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+28
| | | | | | | | | | | | | | | | | | | | 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-241-10/+10
|\ \ | |/ | | | | | | | | | | 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
| |
* | Merge branch 'master' into careminsterMelanie2013-07-182-0/+100
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
* | Merge branch 'master' into careminsterMelanie2013-07-041-0/+4
|\ \ | |/
| * Fix SQL statementDiva Canto2013-07-021-1/+1
| |
| * Do the same for SQLite and MSSQLDiva Canto2013-07-021-1/+1
| |
| * This should have a strong effect on the Unknown User issue mantis #6625Diva Canto2013-07-021-0/+4
| |
* | Merge branch 'master' into careminsterMelanie2013-06-301-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * 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/+3
|\ \ | |/
| * * This fixes having to select and deselect prim to get keyframemotion to ↵teravus2013-06-121-2/+3
| | | | | | | | start running when pulled from data storage.
* | Merge branch 'master' into careminsterMelanie2013-06-112-0/+32
|\ \ | |/
| * * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵teravus2013-06-112-0/+32
| | | | | | | | | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active.
* | Merge branch 'master' into careminsterMelanie2013-06-112-0/+994
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * SQLite support for UserProfilesBlueWall2013-06-072-0/+994
| |
* | Merge branch 'master' into careminsterMelanie2013-05-111-0/+9
|\ \ | |/ | | | | | | | | | | | | 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/+9
| | | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-02-281-5/+23
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Add asset name and description truncation warnings to SQLite database plugin ↵Justin Clark-Casey (justincc)2013-02-271-5/+23
| | | | | | | | for consistency.
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-102-0/+30
|\ \ | |/ | | | | | | | | 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-092-0/+30
| |
* | Merge branch 'master' into careminsterMelanie2013-02-053-2/+24
|\ \ | |/ | | | | | | | | | | | | 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
| * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-1/+23
| |\
| | * Remove the accidental PrimShapes column that I added back to the SQLite ↵Justin Clark-Casey (justincc)2013-01-251-2/+1
| | | | | | | | | | | | region store
| | * Fix tests by adding DynAttrs add column commands to RegionStore.migrations ↵Justin Clark-Casey (justincc)2013-01-251-0/+6
| | | | | | | | | | | | (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago).
| | * Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic ↵Oren Hurvitz2013-01-251-1/+5
| | | | | | | | | | | | attributes
| | * Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-251-8/+0
| | |
| | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-251-4/+4
| | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-0/+21
| | |
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| |/ | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-12-19 05:13:39 +0000