aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into careminsterMelanie2013-03-0111-59/+126
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-012-23/+36
| | | | | | | | | | | | | | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
| | * | | 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-011-19/+15
| | |\ \ \
| | | * \ \ 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-2831-94/+478
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | 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
| | |/ /
| | * | 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-2735-295/+705
| | |\ \
| | | * | 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
| | | * | 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-2712-14/+14
| | | | | | | | | | | | | | | | | | | | [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-2720-216/+301
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * | | 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 warning in ConfigurationLoaderTestJustin Clark-Casey (justincc)2013-02-261-0/+2
| | | | |
| | * | | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-264-22/+84
| | | | |
| | * | | 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-2616-269/+708
| |\ \ \ \ | | |/ / /
| | * | | 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-256-39/+56
| | |\ \
| | | * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-256-39/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| | | | | | | | | | | | | | | | | | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
| | * | | Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the ↵Diva Canto2013-02-254-3/+16
| | |/ / | | | | | | | | | | | | roles cache.
| * | | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-02-2315-60/+129
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * | 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 ↵Justin Clark-Casey (justincc)2013-02-221-0/+6
| | | | | | | | | | | | | | | | | | | | set only for region crossing and not teleport, etc.
| | | * | Make reset of EntityTransferStateMachine for an avatar transfer always ↵Justin Clark-Casey (justincc)2013-02-221-42/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | happen despite unexpected exceptions. This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again. This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.