aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-143-2/+29
|\
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-2/+29
* | Merge branch 'master' into careminsterMelanie2012-05-131-0/+1
|\ \ | |/
| * Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-29/+2
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-2/+29
| * Add even for terrain tainting and synchronize terrain module with physics sce...Dan Lake2012-05-101-0/+1
| * Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| * Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-073-6/+32
* | Merge branch 'master' into careminsterMelanie2012-05-054-25/+34
|\ \ | |/
| * Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-05-051-1/+0
| * Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-033-24/+34
* | Merge branch 'master' into careminsterMelanie2012-04-291-9/+15
|\ \ | |/
| * Put scene object related console commands into new "Objects" help category ra...Justin Clark-Casey (justincc)2012-04-281-9/+13
| * Add flags information (phantom, physics, etc.) to "show object" and "show par...Justin Clark-Casey (justincc)2012-04-271-0/+2
* | Merge branch 'master' into careminsterMelanie2012-04-272-10/+26
|\ \ | |/
| * If a Grid God teleports then include the Godlike teleport flag. This can affe...Oren Hurvitz2012-04-271-9/+22
| * Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-1/+4
* | Merge branch 'master' into careminsterMelanie2012-04-275-8/+13
|\ \ | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-274-6/+6
| * When creating an OAR, objects where the user is the Creator are always includ...Oren Hurvitz2012-04-261-2/+7
* | Adapt some TeleportWithMomentum callsMelanie2012-04-251-1/+1
* | Merge branch 'master' into careminsterMelanie2012-04-243-6/+6
|\ \ | |/
| * Changed the Map-related messages from Info to Debug. They're debug messages.Diva Canto2012-04-234-8/+8
* | Merge branch 'master' into careminsterMelanie2012-04-231-2/+2
|\ \ | |/
| * Fix bug where setting phantom on a prim would result in a server log message ...Justin Clark-Casey (justincc)2012-04-221-2/+2
| * 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-181-1/+1
|\ \ | |/
| * On "show part" command, show link number.Justin Clark-Casey (justincc)2012-04-181-1/+1
* | Merge branch 'master' into careminsterMelanie2012-04-173-4/+4
|\ \ | |/
| * refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateM...Justin Clark-Casey (justincc)2012-04-173-4/+4
* | Merge branch 'master' into careminsterMelanie2012-04-112-2/+16
|\ \ | |/
| * New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as orig...Snoopy Pfeffer2012-04-101-2/+13
| * Do not timeout group member cache entry, as long as there are frequent group ...Snoopy Pfeffer2012-04-101-0/+3
* | Merge branch 'master' into careminsterMelanie2012-04-071-5/+2
|\ \ | |/
| * Revert last commitSnoopy Pfeffer2012-04-051-22/+25
| * Group based access restrictions to parcels require group membership, but not ...Snoopy Pfeffer2012-04-051-25/+22
| * Little bug fix in HasGroupAccess, to properly store the case "true" in the ca...Snoopy Pfeffer2012-04-051-5/+2
| * Simplify group access checks and break them out into a separate method.Melanie2012-04-051-57/+49
* | Remove some unneeded parensMelanie2012-04-041-1/+1
* | Adjust Snoopy's contribution for AVNMelanie2012-04-051-56/+14
* | Merge branch 'master' into careminsterMelanie2012-04-041-1/+57
|\ \ | |/
| * Implements group based access restrictions for parcels of land. Because of ca...Snoopy Pfeffer2012-04-051-1/+57
* | 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' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-311-8/+22
|\ \
| * | Cache the last maptile and return the cachrd tile if the last request isMelanie2012-03-291-8/+22