aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-206-39/+34
|\
| * Remove pointless ThreadAbortException catching in a test that isn't run anyway.Justin Clark-Casey (justincc)2012-03-201-11/+5
| * Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| * Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at th...Justin Clark-Casey (justincc)2012-03-201-10/+16
| * Add some doc about the EventManager.OnLoginsEnabled event.Justin Clark-Casey (justincc)2012-03-191-0/+7
| * Fix a bug where logins to standalones would fail if the RegionReady module wa...Justin Clark-Casey (justincc)2012-03-191-7/+2
| * Stop console command "xengine status" throwing an exception if there are no s...Justin Clark-Casey (justincc)2012-03-191-4/+4
* | Remove debug output using Console.WriteLine and trim excessive whitespaceMelanie2012-03-191-8/+0
* | Merge branch 'ubitwork'Melanie2012-03-199-22/+4918
|\ \
| * | added a new UbitMeshing module so i can mess it...UbitUmarov2012-03-176-0/+4726
| * | some more work on costsUbitUmarov2012-03-163-22/+192
* | | Merge branch 'master' into careminsterMelanie2012-03-1830-272/+970
|\ \ \ | |/ / |/| / | |/
| * 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-173-40/+182
| * 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-173-0/+30
| |\
| | * Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-173-0/+30
| * | Region access control! Region operators can now specify things like DisallowF...Diva Canto2012-03-173-29/+142
| |/
| * 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-161-1/+6
| |\
| | * refactor: separate out console and status report generation parts of XEngineJustin Clark-Casey (justincc)2012-03-161-1/+6
| * | Terrain: added [Terrain] section with an option to load an initial flat terra...Diva Canto2012-03-163-19/+59
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-158-114/+174
| |\
| | * Allow comments to appear in command scripts (e.g. shutdown_commands.txt).Justin Clark-Casey (justincc)2012-03-161-1/+5
| | * 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-1511-21/+270
|\ \ \
| * | | 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-158-1/+70
| * | | | 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
| * | | Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11