aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Also do other MySQL region settings related calls under m_dbLock, in common w...Justin Clark-Casey (justincc)2012-08-311-117/+130
| * Do Windlight storage and removal calls in MySQL under m_dbLock, as is done wi...Justin Clark-Casey (justincc)2012-08-311-102/+108
* | Merge branch 'master' into careminsterMelanie2012-08-291-0/+10
|\ \ | |/
| * Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folder...Justin Clark-Casey (justincc)2012-08-291-0/+10
| * 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
|\ \
| * | 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
|\ \ \ | | |/ | |/|
| * | 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
* | | Merge branch 'avination' into careminsterMelanie2012-06-291-26/+34
|\ \ \ | | |/ | |/|
| * | Prevent bad prim in the database from crashing the sim, list affectedMelanie2012-06-261-26/+34
* | | Merge branch 'avination' into careminsterMelanie2012-06-114-2/+49
|\ \ \ | |/ /
| * | 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
|\ \ \ | | |/ | |/|
| * | 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
| |\