aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-094-48/+221
|\
| * minor: Adjust method doc on IXInventoryData MoveItem() and MoveFolder() to ma...Justin Clark-Casey (justincc)2012-11-091-6/+6
| * Update parent inventory folder version numbers when folders are moved/created...Justin Clark-Casey (justincc)2012-11-094-47/+220
* | Merge branch 'master' into careminsterMelanie2012-11-082-5/+76
|\ \ | |/
| * Update folder version numbers when moving items and making the Delete(string[...Justin Clark-Casey (justincc)2012-11-062-4/+53
| * Increment version number of a folder when an object it contains is deleted.Justin Clark-Casey (justincc)2012-11-061-3/+25
* | Merge branch 'master' into careminsterMelanie2012-10-231-5/+20
|\ \ | |/
| * SQLite DB: some values of land data will be not saved / loadedPixelTomsen2012-10-211-5/+20
* | Merge branch 'master' into careminsterMelanie2012-10-124-17/+4
|\ \ | |/
| * Disambiguate use of RegionFlags in NullRegionDataJustin Clark-Casey (justincc)2012-10-091-0/+1
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-093-17/+3
* | Merge branch 'master' into careminsterMelanie2012-09-291-3/+0
|\ \ | |/
| * Removed the bits about the TOSModule. That module doesn't go into core. WARNI...Diva Canto2012-09-271-3/+0
* | 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
|\ \ | |/