aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Terrain (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-291-27/+34
|\
| * formattingSignpostMarv2012-08-271-22/+22
| * refactoring to load from self (fixes ChanneDigger being absent)SignpostMarv2012-08-271-5/+11
| * refactoring to assign the first argument to a variableSignpostMarv2012-08-271-4/+5
* | Merge branch 'master' into careminsterMelanie2012-07-121-1/+1
|\ \ | |/
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-111-1/+1
* | Merge branch 'master' into careminsterMelanie2012-07-051-0/+34
|\ \ | |/
| * porting console commands from raw2sculpt 3.2SignpostMarv2012-07-051-0/+34
* | Merge branch 'master' into careminsterMelanie2012-06-061-2/+0
|\ \ | |/
| * Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen f...Justin Clark-Casey (justincc)2012-06-051-2/+0
* | Merge branch 'master' into careminsterMelanie2012-05-272-13/+17
|\ \ | |/
| * Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-252-13/+17
* | Merge branch 'master' into careminsterMelanie2012-05-131-0/+1
|\ \ | |/
| * Add even for terrain tainting and synchronize terrain module with physics sce...Dan Lake2012-05-101-0/+1
| * Improve bitmap disposal to do null checks and not to potentially try disposal...Justin Clark-Casey (justincc)2012-04-201-4/+7
* | Merge branch 'master' into careminsterMelanie2012-04-202-46/+78
|\ \ | |/
| * Always dispose of existing opened bitmap from file in SaveFile(), instead of ...Justin Clark-Casey (justincc)2012-04-201-22/+37
| * Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and J...Justin Clark-Casey (justincc)2012-04-202-18/+31
| * concerns GenericSystemDrawing.csGarmin Kawaguichi2012-04-201-8/+9
* | Merge branch 'master' into careminsterMelanie2012-04-0311-3/+74
|\ \ | |/
| * terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawagui...Garmin Kawaguichi2012-04-0311-3/+74
* | Merge branch 'master' into careminsterMelanie2012-03-271-2/+0
|\ \ | |/
| * In TerrainModule.cs, the command terrain save-tile is modified to remove an u...Garmin Kawaguichi2012-03-271-2/+0
* | Merge branch 'master' into careminsterMelanie2012-03-253-33/+61
|\ \ | |/
| * Hack example on to "terrain save-tile" extended help.Justin Clark-Casey (justincc)2012-03-241-0/+6
| * Use system provided temporary file in "terrain save-tile" to avoid problems w...Justin Clark-Casey (justincc)2012-03-241-3/+3
| * Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-242-30/+52
* | Merge branch 'master' into careminsterMelanie2012-03-231-6/+6
|\ \ | |/
| * Comment out a terrain save-tile debugging message that accidentally crept in ...Justin Clark-Casey (justincc)2012-03-221-6/+6
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-0/+6
|\ \ | |/
| * Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-221-0/+6
* | Merge branch 'master' into careminsterMelanie2012-03-181-1/+6
|\ \ | |/
| * Terrain: added [Terrain] section with an option to load an initial flat terra...Diva Canto2012-03-161-1/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-191-19/+32
|\ \ | |/
| * For TerrainModule.SaveToFile(), don't bother throwing the exception onwards a...Justin Clark-Casey (justincc)2011-11-171-1/+0
| * Make "terrain save" more friendly by telling the user if we have saved and pu...Justin Clark-Casey (justincc)2011-11-171-18/+32
* | Resolve merge commits, stage 1Tom2011-09-041-1/+1
|\ \ | |/
| * use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.Justin Clark-Casey (justincc)2011-07-181-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-177-0/+132
|\ \ | |/
| * Implemented terrain save-tile command. Does the opposite of load-tile. For no...Diva Canto2011-04-127-0/+132
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-011-2/+13
|\ \ | |/
| * Added code to load a terrain tile of tiff/jpg format. Previously it only work...Diva Canto2011-03-281-2/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-292-22/+227
|\ \ | |/
| * Display supported file extensions/formats in "terrain load help" (Mantis #5349)Kevin Cozens2011-01-281-2/+8
| * Added loading and saving of terrain files using Terragen format (Mantis #1564)Kevin Cozens2011-01-281-20/+219
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-1/+8
|\ \ | |/
| * refactor: move Scene.TerrainUnAcked() handling into TerrainModuleJustin Clark-Casey (justincc)2010-08-131-1/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-312-3/+8
|\ \ | |/