aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-2836-127/+538
|\
| * 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-288-24/+342
| * Robust.HG.ini.example updated to get an [Hypergrid] section too.Diva Canto2013-02-281-14/+15
| * Removed duplicate 'using' statement.Diva Canto2013-02-271-1/+0
| * Switched to using the other Util function with a default value.Diva Canto2013-02-2712-14/+28
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-2739-302/+722
| |\
| | * 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
| | * Do not have the Freeswitch connector on by default in Robust ini example files.Justin Clark-Casey (justincc)2013-02-272-2/+4
| | * Add asset name and description truncation warnings to SQLite database plugin ...Justin Clark-Casey (justincc)2013-02-271-5/+23
| | * Add more information to warnings logged when asset names and descriptions hav...Justin Clark-Casey (justincc)2013-02-273-6/+18
| * | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-2715-31/+55
* | | Merge branch 'master' into careminsterMelanie2013-02-275-13/+273
|\ \ \ | | |/ | |/|
| * | minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-272-2/+1
| * | Show http poll handlers in separate http (poll) section of "show http-handler...Justin Clark-Casey (justincc)2013-02-271-2/+5
| * | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-272-9/+266
* | | Merge branch 'master' into careminsterMelanie2013-02-2722-221/+314
|\ \ \ | |/ /
| * | Improve description of GenerateMapTiles config optionJustin Clark-Casey (justincc)2013-02-271-7/+8
| * | Add documentation on default or Warp3D image module choice to OpenSim.ini.exa...Justin Clark-Casey (justincc)2013-02-271-0/+6
| * | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-2714-212/+245
| * | minor: Remove unnecessary very old System.Net reference in OpenSim.Region.Scr...Justin Clark-Casey (justincc)2013-02-261-1/+0
| * | minor: remove warning in ConfigurationLoaderTestJustin Clark-Casey (justincc)2013-02-261-0/+2
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-265-22/+86
| * | BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
* | | Merge branch 'master' into careminsterMelanie2013-02-2619-321/+762
|\ \ \ | |/ /
| * | BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-258-91/+109
| |\
| | * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-258-91/+109
| * | Mantis #6552 -- stricter error (crash) if server URL is malformed.Diva Canto2013-02-251-5/+2
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-255-218/+628
| |\
| | * 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
| | * Make StatsManager default output a little more readableRobert Adams2013-02-241-1/+1
| | * Add EventHistogram.GetHistogramAsOSDMap that returns that parametersRobert Adams2013-02-241-211/+228
| | * Modify StatsManager so console command "show stats category container"Robert Adams2013-02-241-5/+24
| | * Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| * | Missing var in [LoginService] for HG Robust.Diva Canto2013-02-251-0/+1
| * | Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the roles...Diva Canto2013-02-254-3/+16
| |/
* | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
* | Merge branch 'master' into careminsterMelanie2013-02-2318-63/+140
|\ \ | |/
| * More clarification on the [Groups] sectionDiva Canto2013-02-231-0/+1
| * Further clarification on the same spot.Diva Canto2013-02-231-0/+1
| * Improved documentation of Groups section.Diva Canto2013-02-231-2/+6
| * 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-2213-15/+54
| |/