aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'master' into careminsterMelanie2012-03-312-7/+5
|\ \ \ | |/ / |/| / | |/
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ...Justin Clark-Casey (justincc)2012-03-301-6/+4
* | 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
| * Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-223-20/+38
|\ \ | |/
| * Rework Diva's patch to simplify itMelanie2012-03-222-16/+29
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-222-69/+6
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-222-6/+69
| * Replace "scene debug true false true" console command with "scene debug scrip...Justin Clark-Casey (justincc)2012-03-211-1/+7
* | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+1
| |\
| * | Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
|\ \ \ | | |/ | |/|
| * | fix compile error from last commitJustin Clark-Casey (justincc)2012-03-211-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-211-18/+7
|\ \ | |/
| * refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()Justin Clark-Casey (justincc)2012-03-211-18/+7
* | Merge branch 'master' into careminsterMelanie2012-03-201-2/+0
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-2/+0
* | Merge branch 'master' into careminsterMelanie2012-03-184-77/+93
|\ \ | |/
| * Terrain: added [Terrain] section with an option to load an initial flat terra...Diva Canto2012-03-161-1/+6
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-151-72/+51
| |\
| | * In Top Scripts report, don't show scripts with no or less than 1 microsecond ...Justin Clark-Casey (justincc)2012-03-161-0/+6