aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Don't allow deletion of a terrain from the database unless we have one to ↵Melanie2011-12-051-7/+21
| | | | | | | | replace it with
* | Merge branch 'master' into bigmergeMelanie2011-11-191-0/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+2
| | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly
| * Remove mono compiler warnings. Fix problem with co-ordinate given in ↵Justin Clark-Casey (justincc)2011-11-191-5/+5
| | | | | | | | deregister region message
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-191-0/+20
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
* | Merge branch 'master' into bigmergeMelanie2011-11-141-1/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-1/+9
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-031-5/+0
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
| * Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2
| |
* | Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2
| |
* | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmergeMelanie2011-10-111-2/+4
|\ \ | |/
| * Null simulation data must return a non-null region settings or other parts ↵Dan Lake2011-09-201-2/+4
| | | | | | | | of the simulator expect
* | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-113-66/+0
|\ \ | |/
| * Remove vestigal OpenSim.Data mono addins extension points that don't look ↵Justin Clark-Casey (justincc)2011-09-203-66/+0
| | | | | | | | like they've been active for at least 2 and a half years
* | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmergeMelanie2011-10-113-7/+71
|\ \ | |/
| * MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore ↵Chris Hart2011-09-163-7/+71
| | | | | | | | and InventoryStore
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-114-140/+231
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-164-140/+231
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Bring us up to date.Tom2011-09-142-1/+4
|\ \ | |/
| * Fix unit tests from RegionSettings commitJustin Clark-Casey (justincc)2011-09-091-0/+4
| |
| * Save the default terrain texture UUIDs for a new region instead of leaving ↵Justin Clark-Casey (justincc)2011-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | them as UUID.Zero. Leaving them at UUID.Zero meant that when a viewer 2 logged into a region that had been freshly created, it received UUID.Zero for these textures, and hence display the land as plain white. On a simulator restart, the problem would go away since when the database adapators loaded the new region settings, RegionSettings itself has code to use default textures instead of UUID.Zero. This commit resolves the problem by saving the default texture UUIDs instead of Zero. However, we currently have to do this in a roundabout way by resaving once the RegionSettings have been created by the database for the first time. This needless complexity should be addressed. This change will also have the effect of replacing any existing UUID.Zero terrain textures with the default ones. However, this shouldn't have any effect since the UUID.Zeros were already being replaced in memory with those same UUIDs.
* | Resolve merge commits, stage 1Tom2011-09-0417-100/+90
|\ \ | |/
| * Remove code which was automatically deleting non-root prims from scene ↵Justin Clark-Casey (justincc)2011-09-012-32/+0
| | | | | | | | | | | | | | objects that had previous been attachments. Looks like this code was accidentally uncommented in e1b5c612 from feb 2010. Appears to resolve the rest of http://opensimulator.org/mantis/view.php?id=5664
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-311-1/+1
| |
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵Justin Clark-Casey (justincc)2011-08-271-4/+2
| | | | | | | | pointless duplication of identical values
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-08-182-2/+2
| |
| * In the asset service, check that an asset exists before attempting to store it.Justin Clark-Casey (justincc)2011-08-171-2/+7
| |
| * Remove un-needed ATTACH command in migration script.BlueWall2011-08-151-3/+1
| | | | | | | | | | | | This was causing issues when using specified paths to database files by using a hard-coded name.
| * minor: a little bit of log message correction/commenting outJustin Clark-Casey (justincc)2011-08-111-1/+1
| |
| * rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)2011-08-064-44/+44
| |
| * refactor: Pull up Assembly of the SQLite classes as a protected property, so ↵Marck2011-07-166-11/+32
| | | | | | | | that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 for MySQL -- no functional changes.
* | Allow removing users from search and avatar pickerMelanie2011-07-311-2/+2
| |
* | Don't store the default WL profile. This will prevent "valid" from beingMelanie2011-07-051-1/+1
| | | | | | | | set on the default profile and hopefully finally fix day and night
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-06-2017-55/+905
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-1/+1
| |\ \ | | |/
| | * Switched order of SQL statements in Friends migration -- resulted in the ↵Diva Canto2011-06-111-1/+1
| | | | | | | | | | | | wrong key
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-0/+16
| |\ \ | | |/
| | * For MySQL, migrate region tables to the MyISAM storage engine rather than InnoDBJustin Clark-Casey (justincc)2011-06-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Using MyISAM proves vastly faster for persisting scene objects. For instance, a scene object that took 9 seconds to persist before now takes 1. This also improves the experience of loading large OARs. We don't use any of the transactional features of InnoDB. The only thing that may have an impact is that InnoDB does row locking on inserts while MyISAM does table locking. However, field reports say there is no noticeable difference.
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-0916-55/+889
| |\ \ | | |/
| | * This is the better solution: make the combined key be only on the first 36 ↵Diva Canto2011-06-011-1/+2
| | | | | | | | | | | | characters of each field -- that's the UUIDs. Thanks coyled. WARNING: Again, people who have gone through this migration and failed need to run it manually.
| | * It looks like there's a better solution for that problem.Diva Canto2011-06-011-2/+1
| | | | | | | | | | | | | | | | | | Revert "Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually." This reverts commit 3fa54a156a83e498a7d5d0949a5f848fe82fe86f.
| | * Changed Friends table to have 165-sized varchars on PrincipalID and ↵Diva Canto2011-06-011-1/+2
| | | | | | | | | | | | FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually.
| | * Updates to MSSQL to most recent compatibility, also included Windlight ↵Chris Hart2011-06-0110-48/+828
| | | | | | | | | | | | support. Needs plenty of testing but clean install and migration from 0.6.9 have been tested and work, a few indexes still need to be added for performance.
| | * Fix dumb sql mistake in MSSQLGenericTableHandler.Delete()Justin Clark-Casey (justincc)2011-05-311-1/+1
| | |
| | * fix bug where generic sqlite table delete wasn't working.Justin Clark-Casey (justincc)2011-05-271-1/+1
| | | | | | | | | | | | this would have caused dupe links bugs when using the sqlite adaptor
| | * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-225-5/+30
| | | | | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
| | * Fixed permissions bug related to friends in PermissionsModule. Added ↵Diva Canto2011-05-215-2/+24
| | | | | | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-217-24/+125
| | |\
| | * | HG Friends working to some extent: friendships offered and accepted ↵Diva Canto2011-05-193-3/+9
| | | | | | | | | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.