aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * minor: Adjust method doc on IXInventoryData MoveItem() and MoveFolder() to ↵Justin Clark-Casey (justincc)2012-11-091-6/+6
| | | | | | | | make it clear we're moving to an existing folder.
| * Update parent inventory folder version numbers when folders are ↵Justin Clark-Casey (justincc)2012-11-094-47/+220
| | | | | | | | | | | | | | | | 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-11-082-5/+76
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
| * Update folder version numbers when moving items and making the ↵Justin Clark-Casey (justincc)2012-11-062-4/+53
| | | | | | | | | | | | | | | | Delete(string[], string[]) call (not just string, string). This is to stop viewer inventory cache version numbers becoming out of sync with grid stored numbers when viewer performs these actions. If there are no problems with these changes, they will be propogated to SQLite (and MSSQL if that's simple enough). May also need to do the same on folder store/create/delete and maybe propogate version increments up the folder hierarchy, but that requires investigation.
| * Increment version number of a folder when an object it contains is deleted.Justin Clark-Casey (justincc)2012-11-061-3/+25
| | | | | | | | Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted.
* | 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>
* | Merge branch 'master' into careminsterMelanie2012-10-124-17/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Disambiguate use of RegionFlags in NullRegionDataJustin Clark-Casey (justincc)2012-10-091-0/+1
| | | | | | | | | | This was not necessary with the nant build but is for xbuild, since xbuild includes associated project DLLs And so picks up OpenMetaverse.dll even though it isn't referenced by OpenSim.Data.Null.dll
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵Justin Clark-Casey (justincc)2012-10-093-17/+3
| | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
* | Merge branch 'master' into careminsterMelanie2012-09-291-3/+0
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Removed the bits about the TOSModule. That module doesn't go into core. ↵Diva Canto2012-09-271-3/+0
| | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there.
* | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-0/+8
|\ \ | |/
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-251-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-08-311-219/+238
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Also do other MySQL region settings related calls under m_dbLock, in common ↵Justin Clark-Casey (justincc)2012-08-311-117/+130
| | | | | | | | with other calls.
| * Do Windlight storage and removal calls in MySQL under m_dbLock, as is done ↵Justin Clark-Casey (justincc)2012-08-311-102/+108
| | | | | | | | with all the other database calls.
* | Merge branch 'master' into careminsterMelanie2012-08-291-0/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
| * Fix and finish the extra parameters storage system for MySQLMelanie2012-08-151-1/+57
| |
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-155-0/+58
| |
* | Fix and finish the extra parameters storage system for MySQLMelanie2012-08-151-1/+57
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-155-0/+59
| |
* | Merge branch 'avination' into careminsterMelanie2012-07-111-2/+17
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | Fix storing vehicle dataMelanie2012-07-071-2/+2
| | |
| * | Add saving vehicle physics data to the databaseMelanie2012-07-071-2/+17
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-111-3/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | minor: remove some recent mono compiler warningsJustin Clark-Casey (justincc)2012-07-071-2/+0
| | |
| * | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-071-1/+1
| | | | | | | | | | | | | | | This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
* | | Merge branch 'avination' into careminsterMelanie2012-06-291-26/+34
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Prevent bad prim in the database from crashing the sim, list affectedMelanie2012-06-261-26/+34
| | | | | | | | | | | | ids and skip them.
* | | Merge branch 'avination' into careminsterMelanie2012-06-114-2/+49
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Typo fixMelanie2012-06-071-3/+5
| | |
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-074-0/+45
| | |
* | | 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.
generated by cgit v1.1 at 2024-10-22 17:41:45 +0000