aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork'Melanie2012-03-1910-22/+4949
|\
| * added a new UbitMeshing module so i can mess it...UbitUmarov2012-03-177-0/+4757
| * some more work on costsUbitUmarov2012-03-163-22/+192
* | Merge branch 'master' into careminsterMelanie2012-03-1848-399/+1088
|\ \ | |/ |/|
| * Amend to previous commit: normalize strings ToLower.Diva Canto2012-03-171-2/+6
| * More on HG access control. This commit splits the UserManagementModule into t...Diva Canto2012-03-175-40/+184
| * BAD JUSTIN!Diva Canto2012-03-173-0/+3
| * Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ...Diva Canto2012-03-173-55/+62
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-174-0/+31
| |\
| | * Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-174-0/+31
| * | Region access control! Region operators can now specify things like DisallowF...Diva Canto2012-03-179-35/+166
| |/
| * Clean up "save iar" helpJustin Clark-Casey (justincc)2012-03-171-8/+8
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-163-8/+71
| |\
| | * minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
| | * Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| | * refactor: separate out console and status report generation parts of XEngineJustin Clark-Casey (justincc)2012-03-161-1/+6
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-161-0/+11
| | |\
| | * | Improve threadpool reporting to "show threads" console command (also gets pri...Justin Clark-Casey (justincc)2012-03-162-7/+57
| * | | Terrain: added [Terrain] section with an option to load an initial flat terra...Diva Canto2012-03-165-20/+65
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-1514-227/+191
| |\ \ | | |/
| | * Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-162-4/+11
| | * Move startup_commands.txt.example to startup_commands.txt for consistency wit...Justin Clark-Casey (justincc)2012-03-163-4/+4
| | * Remove unnecessary "backup" command in shutdown_commands.txtJustin Clark-Casey (justincc)2012-03-161-1/+2
| | * Allow comments to appear in command scripts (e.g. shutdown_commands.txt).Justin Clark-Casey (justincc)2012-03-161-1/+5
| | * Remove unused bin/ScriptEngines/Default.lslJustin Clark-Casey (justincc)2012-03-161-104/+0
| | * In Top Scripts report, don't show scripts with no or less than 1 microsecond ...Justin Clark-Casey (justincc)2012-03-161-0/+6
| | * Aggregate script execution times by linksets rather than individual prims.Justin Clark-Casey (justincc)2012-03-164-4/+23
| | * 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-167-70/+145
| * | More on map search: send extra messages to the user regarding the region bein...Diva Canto2012-03-151-0/+11
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-157-5/+273
| |\
| | * Protect the scriptmodulecomms interface.Mic Bowman2012-03-151-1/+4
| | * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-157-5/+270
| * | 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-154-225/+158
| |\ \ | | |/
| * | 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 'ubitwork'Melanie2012-03-1513-21/+276
|\ \ \
| * | | Playing with object costs CAPS ...UbitUmarov2012-03-151-2/+118
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-151-1/+1
| |\ \ \
| * | | | added ObjectPhysicsProperties http event message to send viewer that data. F...UbitUmarov2012-03-1510-1/+76
| * | | | bug fixs, added a default physics shape estimator based on being a mesh or no...UbitUmarov2012-03-144-18/+82
* | | | | Merge branch 'master' into careminsterMelanie2012-03-154-229/+155
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-152-170/+115
| * | | Simplify some logic in the ScriptInstance constructor - running is set to fal...Justin Clark-Casey (justincc)2012-03-151-9/+3
| * | | minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12