aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-0114-171/+220
|\
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-014-115/+129
| | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
| * Removed more vars from [Startup]. I think these were already moved ↵Diva Canto2013-03-011-20/+0
| | | | | | | | elsewhere, because I can't find any reference to them in the code.
| * 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
| | | | | | | | | | | | maximum velocity and angular velocity values for prims.
| * | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| |/ | | | | | | It turns out this is required to get Mono.Addins to pick up plugin DLLs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-012-19/+16
| |\
| | * Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent ↵Robert Adams2013-02-281-0/+1
| | | | | | | | | | | | | | | | | | additions to ScriptEngine tests. Compiles some places but not others.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-289-43/+366
| | |\
| | * | 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-282-0/+8
| | |/ | |/| | | | | | | Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
* | | Merge branch 'master' into careminsterMelanie2013-02-2836-127/+538
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | Fix potential concurrency issue since the LSL notecard cache was not being ↵Justin Clark-Casey (justincc)2013-02-281-7/+10
| | | | | | | | | | | | checked for expiry under lock
| * | Fix bug where simultaneous calls by different scripts to llGetNotecardLine() ↵Justin Clark-Casey (justincc)2013-02-281-12/+14
| | | | | | | | | | | | | | | | | | | | | or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event. This was because the notecard asset ID was being used as the request identifier. Now using a random ID, in common with other code using the DataServer
| * | 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 ↵Justin Clark-Casey (justincc)2013-02-272-0/+10
| | | | | | | | | | | | if adding modules to a DLL which does not already have this
| | * 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, ↵Justin Clark-Casey (justincc)2013-02-271-7/+20
| | | | | | | | | | | | | | | | | | and group shared and non-shared modules together This is to make it easier to tell if a region has a certain module active or not
| | * Do not have the Freeswitch connector on by default in Robust ini example files.Justin Clark-Casey (justincc)2013-02-272-2/+4
| | | | | | | | | | | | | | | | | | This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch) and requires a complicated Freeswitch setup. Having it on but not configured results in spurious warnings in the logs
| | * Add asset name and description truncation warnings to SQLite database plugin ↵Justin Clark-Casey (justincc)2013-02-271-5/+23
| | | | | | | | | | | | for consistency.
| | * Add more information to warnings logged when asset names and descriptions ↵Justin Clark-Casey (justincc)2013-02-273-6/+18
| | | | | | | | | | | | | | | | | | | | | have to be truncated for database storage On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are. Even though they are never subsequently (inventory names/descriptions are always used instead).
| * | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-2715-31/+55
| | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | Merge branch 'master' into careminsterMelanie2013-02-275-13/+273
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | 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 ↵Justin Clark-Casey (justincc)2013-02-271-2/+5
| | | | | | | | | | | | | | | | | | http-handlers" console command instead of never showing them (due to a previous bug). The code was assuming that poll handlers were also included in general http handlers but this was not the case.
| * | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-272-9/+266
| | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b
* | | Merge branch 'master' into careminsterMelanie2013-02-2722-221/+314
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | Improve description of GenerateMapTiles config optionJustin Clark-Casey (justincc)2013-02-271-7/+8
| | |
| * | Add documentation on default or Warp3D image module choice to ↵Justin Clark-Casey (justincc)2013-02-271-0/+6
| | | | | | | | | | | | | | | | | | | | | OpenSim.ini.example. As before, default is MapImageModule. Thanks to Ai Austin for pointing out this omission.
| * | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-2714-212/+245
| | | | | | | | | | | | places where we were not already.
| * | minor: Remove unnecessary very old System.Net reference in ↵Justin Clark-Casey (justincc)2013-02-261-1/+0
| | | | | | | | | | | | OpenSim.Region.ScriptEngine.Shared
| * | 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
| | | | | | | | | | | | | | | be fetched. Update TODO list.
* | | 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
| | | | | | | | | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
| * | 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
| | | | | | | | | | | | | | | by MonitorModule. Left existing functionality (command line and HTTP fetch) and just added StatsManager registration.
| | * Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| | | | | | | | | | | | | | | usage of ProcessCounters which tend to fail oddly and are not supported everywhere.
| | * 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
| | | | | | | | | | | | about the histogram as well as the values.
| | * Modify StatsManager so console command "show stats category container"Robert Adams2013-02-241-5/+24
| | | | | | | | | | | | only outputs the statistics in the specified container in the category.