aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-277-3/+285
|\
| * Environment Module - allows Environment settings for Viewer3 warning: include...PixelTomsen2012-05-237-1/+282
| * 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
|\ \
| * | 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
|\ \ \ | | |/ | |/|
| * | If there are no new prim items to store then don't bother opening the MySqlCo...Justin Clark-Casey (justincc)2012-04-301-3/+3
| * | Consistently use using() to make sure we dispose of used MySqlCommands where ...Justin Clark-Casey (justincc)2012-04-309-431/+446
* | | Merge branch 'master' into careminsterMelanie2012-04-243-22/+42
|\ \ \ | |/ / | | / | |/ |/|
| * Fixed problem with MySQL: it was possible for one thread to use an incomplete...Oren Hurvitz2012-04-243-21/+37
| * When reading a region, use null objects to represent NULL fields.Oren Hurvitz2012-04-241-1/+5
* | Merge branch 'master' into careminsterMelanie2012-03-314-23/+65
|\ \ | |/
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con...Justin Clark-Casey (justincc)2012-03-311-4/+4
| * Add MSSQL login processing fix for servers run on different locales.Justin Clark-Casey (justincc)2012-03-311-0/+5
| * 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
* | 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
|\ \ | |/
| * Fix configuration problems where XAssetDatabasePlugin was picked up accidenta...Justin Clark-Casey (justincc)2012-03-192-11/+58
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
* | 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
| | * Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-062-9/+17
| | * remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
| | * Make asset compression optional. Currently set to false and not configurable...Justin Clark-Casey (justincc)2012-03-031-16/+24
| | * Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | * 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
* | | 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
| |/
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-041-2/+23
|\ \
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-2/+23
* | | Merge branch 'master' into careminsterMelanie2012-03-033-4/+4
|\ \ \ | |/ / |/| / | |/
| * Use correct casing of RegionSettings.Sandbox in the various database modules.Justin Clark-Casey (justincc)2012-02-293-4/+4
* | Merge branch 'master' into careminsterMelanie2012-02-217-0/+20
|\ \ | |/
| * 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
|\ \ | |/
| * 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
|\ \ | |/