aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge branch 'master' into careminsterMelanie2012-12-094-0/+36
|\ \ \ | | |/ | |/|
| * | Restrict IPresenceData.VerifyAgentBlueWall2012-12-094-17/+17
| | | | | | | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result
| * | Add agent verification to PresenceBlueWall2012-12-084-0/+36
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-301-1/+7
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | Fix database service unit test failures by temporarily reverting ↵Justin Clark-Casey (justincc)2012-11-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | BasicDataServiceTest extending OpenSimTestCase. Mono 2.4.3 doesn't like this when running nunit, with nunit throwing AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true. and similar. Mono 2.10.8.1 does not have this issue. So will wait until min version of mono bumps before restoring.
* | | Merge branch 'master' into careminsterMelanie2012-11-257-4/+235
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-244-4/+7
| | | | | | | | automatically turns off any logging enabled between tests
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-243-0/+228
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* | Merge branch 'master' into careminsterMelanie2012-11-173-112/+28
|\ \ | |/
| * refactor: move common inventory folder version update code to parent class ↵Justin Clark-Casey (justincc)2012-11-153-112/+28
| | | | | | | | in mysql, mssql and sqlite database plugins
* | Merge branch 'master' into careminsterMelanie2012-11-153-21/+244
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Improve inventory folder version updating for mssql database plugin.Justin Clark-Casey (justincc)2012-11-151-14/+102
| | | | | | | | | | I am not in a position to test this so the updates have been done blind. If it needs any fixing will probably require patches.
| * Implement folder version updating for the sqlite inventory pluginJustin Clark-Casey (justincc)2012-11-152-7/+142
| |
* | Merge branch 'master' into careminsterMelanie2012-11-1514-303/+310
|\ \ | |/
| * More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where ↵Justin Clark-Casey (justincc)2012-11-149-298/+305
| | | | | | | | | | | | possible. Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
| * Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-135-5/+5
| | | | | | | | have an AssemblyInfo file.
* | Merge branch 'master' into careminsterMelanie2012-11-094-48/+221
|\ \ | |/
| * 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
generated by cgit v1.1 at 2024-12-14 22:29:55 +0000