aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| |
| * Database persistence for keyframes. Contains a Migration.Melanie2013-06-062-4/+32
| |
* | Merge branch 'master' into careminsterMelanie2013-06-043-0/+1235
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding standard OpenSim header to source filesBlueWall2013-05-312-0/+54
| |
| * Fill in fields with default values on profile creationBlueWall2013-05-311-2/+48
| |
| * UserProfilesBlueWall2013-05-303-0/+1135
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | Merge branch 'master' into careminsterMelanie2013-05-112-0/+15
|\ \ | |/ | | | | | | | | | | | | 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-112-0/+15
| | | | | | | | 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-04-021-6/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is ↵Justin Clark-Casey (justincc)2013-04-021-6/+6
| | | | | | | | | | | | either not syntactical or unnecessary. May fix http://opensimulator.org/mantis/view.php?id=6593
* | 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-284-11/+41
|\ \ | |/ | | | | | | 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.
| * Add more information to warnings logged when asset names and descriptions ↵Justin Clark-Casey (justincc)2013-02-273-6/+18
| | | | | | | | | | | | | | 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).
* | Merge branch 'master' into careminsterMelanie2013-02-2212-5/+943
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-195-5/+5
| |
| * First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-193-0/+743
| | | | | | | | rest to Addons.Groups.dll.
| * Offline IM: moved the Data and MySQL bits to the corresponding places in ↵Diva Canto2013-02-193-0/+135
| | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
| * I need these for OfflineIM and Groups.Diva Canto2013-02-181-0/+60
| |
* | Merge branch 'master' into careminsterMelanie2013-02-106-9/+78
|\ \ | |/ | | | | | | | | 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-096-13/+71
| |
| * Rename "Bounciness" to "Restitution"Melanie2013-02-071-2/+2
| |
| * Fix a bug I brought in by manually editing a diff file. Terrain is if cource ↵Melanie2013-02-061-1/+1
| | | | | | | | not always at 20m.
| * Partial port of Avination's support for the new physics parameters.Melanie2013-02-062-18/+51
| | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* | Rename Bounciness to RestitutionMelanie2013-02-071-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-0511-14/+71
|\ \ | |/ | | | | | | | | | | | | 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-056-9/+68
| |\
| | * 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-253-3/+15
| | | | | | | | | | | | attributes
| | * Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-255-28/+5
| | |
| | * Added missing DynAttrs references in MySQLOren Hurvitz2013-01-251-3/+6
| | |
| | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-253-12/+12
| | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | * Implement dynamic attribute persistence on mysql and mssqlJustin Clark-Casey (justincc)2013-01-254-8/+49
| | | | | | | | | | | | mssql is untested
| | * 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-055-5/+5
| |/ | | | | | | | | | | | | | | 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 careminsterMelanie2013-01-041-20/+44
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added locking in NullRegionData.Oren Hurvitz2013-01-021-20/+44
| | | | | | | | This prevents errors when one thread iterates over the regions (e.g., from RegenerateMaptileAndReregister()) while another thread is adding a region.
* | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+1
|\ \
| * | Check database for root prim IDs only to try and get a handle on prim lossMelanie2012-12-091-1/+1
| | | | | | | | | | | | once and for all.