aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-283-12/+149
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-272-2/+105
| |\
| | * Add "friends show cache <first-name> <last-name>" command for debugging purpo...Justin Clark-Casey (justincc)2012-03-282-2/+105
| * | HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-271-10/+44
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-273-2/+37
|\ \ | |/
| * Let grided simulators retrieve the user's inventory skeletonDiva Canto2012-03-271-1/+1
| * User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-272-1/+36
* | Merge branch 'master' into careminsterMelanie2012-03-272-3/+29
|\ \ | |/
| * HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-272-3/+29
* | 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
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-221-7/+10
| |\
| * | Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-221-0/+6
* | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-221-7/+10
|\ \ \ | | |/ | |/|
| * | HG Friends: don't notify if the server isn't there.Diva Canto2012-03-221-7/+10
| |/
| * Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-226-60/+139
|\ \ | |/
| * 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
| * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-212-7/+26
| * HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that w...Diva Canto2012-03-213-20/+58
| * Removed extraneous debug messageDiva Canto2012-03-211-3/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+7
| |\
| | * Replace "scene debug true false true" console command with "scene debug scrip...Justin Clark-Casey (justincc)2012-03-211-1/+7
| * | Removed extraneous debug messages. Added a check for UUID.Zero.Diva Canto2012-03-201-16/+23
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-216-167/+303
|\ \ | |/
| * 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' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-18/+7
| |\ \
| * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-202-9/+2
| |\ \ \
| * | | | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-205-167/+276
| * | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-172-7/+34
* | | | | 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-201-7/+2
|\ \ \ | |/ /
| * | Fix a bug where logins to standalones would fail if the RegionReady module wa...Justin Clark-Casey (justincc)2012-03-191-7/+2
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-1810-145/+482
|\ \ | |/
| * Amend to previous commit: normalize strings ToLower.Diva Canto2012-03-171-2/+6