aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-03-062-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Multiattach, part 1Melanie2013-03-052-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-03-051-2/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | 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]
* | | Merge branch 'avination' into careminsterMelanie2013-03-033-21/+43
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| | |
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-182-19/+39
| | | | | | | | | | | | there was a handler for it.
* | | Merge branch 'master' into careminsterMelanie2013-02-282-18/+13
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-281-2/+2
| | |
| * | Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-271-16/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-271-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-0/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-261-2/+9
|\ \ \ | |/ /
| * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-2/+9
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2013-02-231-0/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2013-02-223-3/+6
|\ \ \ | |/ /
| * | Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-191-1/+0
| | | | | | | | | | | | remove the deprecated TestPath functions.
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
| * | * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-163-5/+5
|\ \ \ | |/ /
| * | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-163-5/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-153-3/+62
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
| * | Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart.
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-1/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-1/+5
|\ \ \ | | |/ | |/|
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-1/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-20/+75
|\ \ \ | |/ /
| * | Revert "Make keyframes use the sim's frame timer"Melanie2013-02-121-8/+15
| | | | | | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f.
| * | Revert "Push updates from keyframe directly to the front of the output queue ↵Melanie2013-02-123-24/+9
| | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-123-9/+24
| | | | | | | | | | | | than through the update system.
| * | Make keyframes use the sim's frame timerMelanie2013-02-111-15/+8
| | |
| * | Refactor KeyframeMotion to use one timer class per sceneMelanie2013-02-111-20/+75
| | |
| * | Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-141-0/+15
|\ \ \ | | |/ | |/|
| * | Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-131-0/+15
| | | | | | | | | | | | | | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node.
* | | Merge branch 'master' into careminsterMelanie2013-02-102-2/+18
|\ \ \ | |/ /
| * | Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| | |
| * | Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
| | | | | | | | | | | | Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
* | | Merge branch 'master' into careminsterMelanie2013-02-081-4/+18
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | If a component of a coalesced object fails to deserialization, do not add a ↵Justin Clark-Casey (justincc)2013-02-081-4/+18
| | | | | | | | | | | | | | | | | | | | | null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading.
* | | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ \ | |/ /
| * | Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| | |
| * | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-071-37/+152
| | | | | | | | | | | | to work with the new params. Not actually plumbed just yet.
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-073-2/+26
| | |
| * | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-50/+6
| | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
| * | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-6/+50
| | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
| * | Rename "Bounciness" to "Restitution"Melanie2013-02-072-6/+6
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-072-0/+9
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2025-02-03 13:28:30 +0000