aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-0110-59/+122
|\
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-012-23/+36
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-014-15/+63
| |\
| | * BulletSim: more things into the TODO list.Robert Adams2013-03-011-1/+6
| | * BulletSim: add parameters, code cleanup around checking and enforcingRobert Adams2013-03-013-14/+57
| * | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-011-19/+15
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-285-24/+299
| | |\
| | * | Bug fix in DataSnapshot, where a var was being used before being initialized.Diva Canto2013-02-281-19/+15
| * | | minor: Log location in which simulator/robust was started.Justin Clark-Casey (justincc)2013-02-281-0/+4
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-02-2815-56/+354
|\ \ \ | |/ /
| * | Fix potential concurrency issue since the LSL notecard cache was not being ch...Justin Clark-Casey (justincc)2013-02-281-7/+10
| * | Fix bug where simultaneous calls by different scripts to llGetNotecardLine() ...Justin Clark-Casey (justincc)2013-02-281-12/+14
| * | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-284-5/+275
| |/
| * Removed duplicate 'using' statement.Diva Canto2013-02-271-1/+0
| * Switched to using the other Util function with a default value.Diva Canto2013-02-274-6/+12
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-2719-118/+432
| |\
| | * Add comment to example region modules about need to add Assembly annotation i...Justin Clark-Casey (justincc)2013-02-272-0/+10
| | * Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-273-18/+13
| | * Get "show modules" console command to show modules in alphabetical order, and...Justin Clark-Casey (justincc)2013-02-271-7/+20
| * | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-274-6/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-274-11/+268
|\ \ \ | | |/ | |/|
| * | minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-272-2/+1
| * | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-272-9/+266
* | | Merge branch 'master' into careminsterMelanie2013-02-2710-64/+103
|\ \ \ | |/ /
| * | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-275-54/+71
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-263-16/+33
| * | BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
* | | Merge branch 'master' into careminsterMelanie2013-02-268-38/+416
|\ \ \ | |/ /
| * | BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-255-33/+35
| * Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
| * Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| * Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
* | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
* | Merge branch 'master' into careminsterMelanie2013-02-236-52/+83
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-222-42/+87
| |\
| | * minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set...Justin Clark-Casey (justincc)2013-02-221-0/+6
| | * Make reset of EntityTransferStateMachine for an avatar transfer always happen...Justin Clark-Casey (justincc)2013-02-221-42/+81
| * | Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-224-7/+8
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-2246-638/+921
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-212-2/+2
| |\
| | * minor: Change summary in "show appearance" console command to "incomplete" ra...Justin Clark-Casey (justincc)2013-02-212-2/+2
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as de...Diva Canto2013-02-214-11/+27
| |/
| * BulletSim: add OutOfBounds logic and some position sanity checkingRobert Adams2013-02-215-33/+68
| * Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-201-0/+5
| * Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2019-111/+18
| |\
| | * Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-194-96/+3
| | * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1915-15/+15