aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * Fix owner name display in "Top Colliders" and "Top Script" region reports.Justin Clark-Casey (justincc)2012-03-161-45/+1
| | * Replace script-lines-per-second with the script execution time scaled by its ...Justin Clark-Casey (justincc)2012-03-161-30/+47
| * | More on map search: send extra messages to the user regarding the region bein...Diva Canto2012-03-151-0/+11
| |/
| * More on SLURLs and V3. This is hacky, but it works. Basically, we have to red...Diva Canto2012-03-151-3/+12
| * Revert "Revert "More hacking around viewer bug""Diva Canto2012-03-151-1/+1
| * These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, ne...Diva Canto2012-03-151-1/+13
| * Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
| * Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
| * More hacking around viewer bugDiva Canto2012-03-151-1/+1
| * Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
* | Merge branch 'master' into careminsterMelanie2012-03-113-16/+24
|\ \ | |/
| * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr...Justin Clark-Casey (justincc)2012-03-101-1/+1
| * minor: rearrange some save oar messages so they say what they're about to do ...Justin Clark-Casey (justincc)2012-03-101-8/+7
| * On OAR saving, try fetch assets serially rather than firing all the requests ...Justin Clark-Casey (justincc)2012-03-102-9/+18
* | Merge branch 'master' into careminsterMelanie2012-03-088-69/+44
|\ \ | |/
| * Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| * Display help commander topics in capitalized form - the commands themselves a...Justin Clark-Casey (justincc)2012-03-081-40/+7
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-088-31/+39
* | Merge branch 'master' into careminsterMelanie2012-03-031-15/+15
|\ \ | |/
| * Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
* | Merge branch 'master' into careminsterMelanie2012-02-241-0/+1
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+1
| * Try to resolve some problems with viewers crashing after hitting parcel banli...Justin Clark-Casey (justincc)2012-02-231-6/+21