aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
| | | | |
* | | | | Merge branch 'avination' into careminsterMelanie2013-03-068-35/+49
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| | | | |
| * | | | Multiattach, part 1Melanie2013-03-056-34/+24
| | | | |
| * | | | Add support for void return typeroot2013-03-031-1/+5
| | | | |
| * | | | Experimental - add void return support to modSendCommandMelanie2013-03-031-0/+2
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-03-057-162/+192
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | | | 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
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | * 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.
| * | | 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
| * | 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
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2013-03-0314-59/+109
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| | |
| * | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| | |
| * | Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| | |
| * | Try to update inventory items when there is a valid asset - may fix temp ↵Melanie2013-02-271-0/+5
| | | | | | | | | | | | textures
| * | Remove osParseJSONNew because it's "object" return type is not useful for LSLroot2013-02-253-7/+1
| | |
| * | Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| | |
| * | Revert "Output some additional data on Vivox connection errors", this logs ↵Melanie2013-02-241-1/+1
| | | | | | | | | | | | | | | | | | passwords! Bad! This reverts commit 79e477f6af09fae2d88a1bba45de6cb819e2800a.
| * | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
| | |
| * | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| | |
| * | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| | | | | | | | | | | | This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2.
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-184-34/+68
| | | | | | | | | | | | there was a handler for it.
| * | Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7
| | |
| * | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-0110-59/+122
|\ \ \ | | |/ | |/|
| * | 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.
* | | | Merge branch 'master' into careminsterMelanie2013-02-2815-56/+354
|\ \ \ \ | |/ / / | | | | | | | | | | | | 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-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
generated by cgit v1.1 at 2025-01-02 04:39:55 +0000