aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * * Apparently, sometimes texture entries come in from the wire with no ↵teravus2013-03-081-0/+17
| | | | | | | | default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
| * * Just another one of those new packet blocks causing a null ref. ↵teravus2013-03-071-1/+1
| | | | | | | | Defaulting to zero length array.....
| * minor: remove some completely unused string local vars added recently in ↵Justin Clark-Casey (justincc)2013-03-061-2/+0
| | | | | | | | commit 984faf2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-066-35/+147
| |\
| | * Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-055-35/+143
| | | | | | | | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values.
| | * Convert doubles passed back through the MOD interface into LSL_FloatsMic Bowman2013-03-051-0/+4
| | |
| * | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-063-8/+33
| | | | | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
| * | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-064-123/+166
| |/ | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode.
| * Fix bug in osGetPrimitiveParams() so that it works for prims with the same ↵Justin Clark-Casey (justincc)2013-03-061-1/+1
| | | | | | | | | | | | owner as the script and not ones with different owners. Addresses http://opensimulator.org/mantis/view.php?id=6560
| * minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-051-2/+4
| |\
* | \ 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 1Melanie2013-03-186-38/+36
| |/ |/| | | | | | | | | | | | | | | | | | | | | 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
* | * 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-022-8/+17
|\
| * 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
* | 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-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
| |/ |/| | | | | 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-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 ↵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
| * 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
| | | | | | | | 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-275-54/+71
| | | | | | | | places where we were not already.
| * 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
| | | | | | | | | | 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-274-6/+6
|/ | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-255-33/+35
| | | | | | | 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.
* 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.
* Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager.