aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-261-6/+6
|\
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento...Justin Clark-Casey (justincc)2012-01-261-6/+6
| * Add a forgotten parameterMelanie2012-01-241-1/+1
* | Correct some SQL syntaxMelanie2012-01-241-1/+1
* | Fix merge artefacts and build breakMelanie2012-01-241-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-242-51/+16
|\ \ | |/
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-241-40/+13
| * IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since theMelanie2012-01-231-12/+3
* | Merge branch 'master' into careminsterMelanie2012-01-231-4/+35
|\ \ | |/
| * Fix up some parameter namingMelanie2012-01-221-2/+2
| * Finish connecting Telehub to databaseBlueWall2012-01-221-3/+19
| * Hooking up new telehub data to the databaseBlueWall2012-01-221-0/+14
* | Merge branch 'master' into careminsterMelanie2012-01-223-2/+95
|\ \ | |/
| * Change the key name I missed in last commitMelanie2012-01-221-1/+1
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-224-87/+95
| * Telehub Support:BlueWall2012-01-212-1/+86
* | Spin off terrain save into a new thread and make it so that it uses the oldMelanie2011-12-131-29/+34
* | Merge branch 'master' into bigmergeMelanie2011-12-051-9/+31
|\ \ | |/
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-9/+31
* | Don't allow deletion of a terrain from the database unless we have one to rep...Melanie2011-12-051-7/+21
* | Merge branch 'master' into bigmergeMelanie2011-11-191-0/+20
|\ \ | |/
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-191-2/+2
| * Remove mono compiler warnings. Fix problem with co-ordinate given in deregis...Justin Clark-Casey (justincc)2011-11-191-5/+5
| * Improve some grid region log messages to express regions at co-ordinate (e.g....Justin Clark-Casey (justincc)2011-11-191-0/+20
* | Merge branch 'master' into bigmergeMelanie2011-11-141-1/+9
|\ \ | |/
| * 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
|\ \ | |/
| * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-5/+0
| * 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 of...Dan Lake2011-09-201-2/+4
* | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-113-66/+0
|\ \ | |/
| * Remove vestigal OpenSim.Data mono addins extension points that don't look lik...Justin Clark-Casey (justincc)2011-09-203-66/+0
* | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmergeMelanie2011-10-113-7/+71
|\ \ | |/
| * MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore and...Chris Hart2011-09-163-7/+71
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-114-140/+231
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-164-140/+231
* | 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 th...Justin Clark-Casey (justincc)2011-09-091-1/+0
* | Resolve merge commits, stage 1Tom2011-09-0417-100/+90
|\ \ | |/
| * Remove code which was automatically deleting non-root prims from scene object...Justin Clark-Casey (justincc)2011-09-012-32/+0
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-311-1/+1
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid poin...Justin Clark-Casey (justincc)2011-08-271-4/+2
| * 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
| * 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