aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-277-3/+285
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-237-1/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Format cleanupBlueWall2012-05-231-2/+2
| |
| * Port Avination's collision fixes to core.Melanie2012-05-151-1/+0
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-151-1/+8
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Port the mel/dahlia fixMelanie2012-05-151-1/+8
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-141-1/+0
|\ \ \ | |/ /
| * | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-141-1/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-309-439/+455
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | If there are no new prim items to store then don't bother opening the ↵Justin Clark-Casey (justincc)2012-04-301-3/+3
| | | | | | | | | | | | MySqlConnection only to do nothing with it.
| * | Consistently use using() to make sure we dispose of used MySqlCommands where ↵Justin Clark-Casey (justincc)2012-04-309-431/+446
| | | | | | | | | | | | this is not already being done.
* | | Merge branch 'master' into careminsterMelanie2012-04-243-22/+42
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fixed problem with MySQL: it was possible for one thread to use an ↵Oren Hurvitz2012-04-243-21/+37
| | | | | | | | incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe.
| * When reading a region, use null objects to represent NULL fields.Oren Hurvitz2012-04-241-1/+5
| | | | | | | | Previously NULL fields were converted to an empty string due to the use of ToString(). But if the field was an Int (e.g., "locZ"), then the subsequent attempt to convert an empty string to an int caused an exception. Now the field is null so we don't try to convert it, so there's no exception.
* | Merge branch 'master' into careminsterMelanie2012-03-314-23/+65
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵Justin Clark-Casey (justincc)2012-03-311-4/+4
| | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned.
| * Add MSSQL login processing fix for servers run on different locales.Justin Clark-Casey (justincc)2012-03-311-0/+5
| | | | | | | | | | | | This may no longer be an issue with better locale enforcement in OpenSimulator but it doesn't hurt to have this patch. http://opensimulator.org/mantis/view.php?id=4680 Thanks to controlbreak for this
| * Lock NullFriendsData.m_Data for consistency and against concurrent read/writeJustin Clark-Casey (justincc)2012-03-301-30/+39
| |
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-302-2/+30
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
* | Fix an invalid cast that only showed at runtimeMelanie2012-03-201-1/+1
| |
* | Store and reload extra physics from databaseMelanie2012-03-201-2/+20
| |
* | Merge branch 'master' into careminsterMelanie2012-03-202-14/+60
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-192-11/+58
| | | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* | Fix a merge artefactMelanie2012-03-091-4/+5
| |
* | Merge branch 'master' into careminsterMelanie2012-03-092-0/+527
|\ \ | |/
| * Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-092-0/+527
| |\
| | * minor: move some compression related var setup inside compression if/then switchJustin Clark-Casey (justincc)2012-03-091-4/+3
| | |
| | * Put big fat EXPERIMENTAL warning in xassetservice database pluginJustin Clark-Casey (justincc)2012-03-091-0/+10
| | | | | | | | | | | | | | | This should not currently be used in any circumstances except for experimentation. Database tables used by this plugin can still change at any time with no migration path.
| | * Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-062-9/+17
| | | | | | | | | | | | | | | | | | | | | Some successful collision attacks have been carried out on sha1 with speculation that more are possible. http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future. Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
| | * remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
| | |
| | * Make asset compression optional. Currently set to false and not ↵Justin Clark-Casey (justincc)2012-03-031-16/+24
| | | | | | | | | | | | configurable from outside MySQLXAssetData.
| | * Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | | | | | | | | | | | | | | | | | Whether this is worthwhile is debatable since here we are not transmitting data over a network In addition, jpeg2000 (the biggest data hog) is already a compressed image format. May not remain.
| | * If asset data already exists with the required hash then don't rewrite itJustin Clark-Casey (justincc)2012-03-031-17/+59
| | |
| | * Perform asset storage transactionallyJustin Clark-Casey (justincc)2012-03-021-57/+69
| | |
| | * Make xassetservice execute one query to retrieve the asset, not twoJustin Clark-Casey (justincc)2012-03-021-28/+4
| | |
| | * Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-022-0/+443
| | | | | | | | | | | | | | | | | | | | | This is an extremely crude implemenation which almost works by accident. Nevertheless it does work. It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing It does not interact at all with the existing asset service or any data stored there. This code is subject to change without notice and should not be used for anything other than gawking.
* | | Merge branch 'master' into careminsterMelanie2012-03-064-7/+169
|\ \ \ | |/ /
| * | Updates to MSSQL store for 0.7.3 to include:Chris Hart2012-03-064-7/+169
| |/ | | | | | | | | | | * Telehub support * Bugfix to Friends lookups * Updates to Creator fields to store up to 255 characters for HG item creator storage
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-2/+23
|\ \ | | | | | | | | | careminster
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-2/+23
| | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
* | | Merge branch 'master' into careminsterMelanie2012-03-033-4/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | 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-293-4/+4
| | | | | | | | | | | | 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-153-306/+700
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 22:38:26 +0000