aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid ↵Justin Clark-Casey (justincc)2013-03-051-140/+161
| | | | | | | | | | | | | | | | | | | | | | | | race conditions between closing agents and scripts that may be doing attachment manipulation. This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
* | | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| | | |
* | | | Multiattach, part 2Melanie2013-03-181-3/+9
| | | |
* | | | Multiattach, part 1Melanie2013-03-187-39/+44
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | * Add a Max Payload size property to the Websocket Server Handler. If you ↵teravus2013-03-051-1/+16
| | | | | | | | | | | | would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed.
* | | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-041-2/+4
|/ / | | | | | | * Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
* | Fix issue in the mesh upload flag module where the ID of the last agent to ↵Justin Clark-Casey (justincc)2013-03-041-6/+6
| | | | | | | | | | | | request the capability was always used instead of the original requesting agent for each cap. Should address http://opensimulator.org/mantis/view.php?id=6556
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-023-9/+40
|\ \
| * | Move AllowedClients and BannedClients section to new [AccessControl] section ↵Justin Clark-Casey (justincc)2013-03-021-2/+10
| | | | | | | | | | | | | | | | | | | | | in OpenSim.ini from [Startup] This change also corrects the setting names - they were actually wrong (though the text in {} was correct). If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
| * | minor: Quieten down the parts of the WebSocketEcho module logging for now ↵Justin Clark-Casey (justincc)2013-03-021-6/+7
| | | | | | | | | | | | where it tells us it is added/loaded/removed from regions
| * | minor: Log number of region modules loaded from each pluginJustin Clark-Casey (justincc)2013-03-021-1/+23
| | |
* | | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
|/ /
* | 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.
* | 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).
| * 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
| * 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.
| * BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| |
* | 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' 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.
generated by cgit v1.1 at 2024-12-23 15:22:02 +0000