aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
|\
| * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
| |
* | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-291-29/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Move the simulator-side RezAttachments call on login to SP.MakeRootAgent ↵Justin Clark-Casey (justincc)2013-03-281-28/+0
| | | | | | | | | | | | | | | | with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary. This is to simplify the code (no tricky 'wasChild' signalling required) and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers) and the viewer-side attaching the v3 viewers perform.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-03-261-0/+1
|\ \ | | | | | | | | | careminster
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Merge branch 'master' into careminsterMelanie2013-03-231-1/+0
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-1/+0
| | | | | | | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
* | Merge branch 'master' into careminsterMelanie2013-03-221-1/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * minor: don't bother with the pause before rezzing attachments if we are ↵Justin Clark-Casey (justincc)2013-03-201-1/+15
| | | | | | | | | | | | running regression tests (fire and forget calls launched on the same thread). Also adds code comments as to why this pause exists.
| * Insert a short delay on the simulator side rezzing of attachments in order ↵Justin Clark-Casey (justincc)2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions. This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar. This doesn't affect version 1 viewers since this delay is shorter than the login delay. This doesn't increase the login time since this part of the process was already being performed asynchronously. This may be a temporary solution.
| * Multiattach, part 1Melanie2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| | |
* | | 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-031-18/+37
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Make Keyframe motion cross regions againMelanie2013-03-031-2/+3
| | |
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-16/+34
| | | | | | | | | | | | there was a handler for it.
* | | 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-101-2/+7
|\ \ \ | |/ /
| * | Fix teleport/telehub issue:BlueWall2013-02-101-2/+7
| | | | | | | | | | | | 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 'avination' into careminsterMelanie2013-02-071-0/+7
|\ \ \ | | |/ | |/|
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-0/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-061-5/+0
|\ \ \ | | |/ | |/|
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-061-11/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵Justin Clark-Casey (justincc)2013-02-061-11/+0
| | | | | | | | | | | | | | | | | | OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused.
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ | |/ /
| * | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-311-108/+106
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-1/+6
| | | | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+13
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-1/+1
|\ \ \ | | |/ | |/|
| * | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-261-1/+1
| | | | | | | | | | | | properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \ | |/ /
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-2/+2
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge branch 'avination' into careminsterMelanie2013-01-231-6/+12
|\ \ \ | |/ /
| * | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-191-0/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-181-0/+5
| | | | | | | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
* | | Merge branch 'master' into careminsterMelanie2013-01-111-103/+80
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-94/+59
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
| * | refactor: route the final scene backup through the same code that handles ↵Justin Clark-Casey (justincc)2013-01-101-10/+1
| | | | | | | | | | | | | | | | | | periodic backup This is rather than making unnecessary duplicate checks that the SOG later performs again.
| * | Add "debug scene pbackup true|false" console command. This enables or ↵Justin Clark-Casey (justincc)2013-01-101-9/+30
| | | | | | | | | | | | | | | | | | disable periodic scene backup. For debug purposes. If false, scene is still saved on shutdown.
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-0/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-081-0/+1
| | | | | | | | | | | | crashes login on some viewers.
* | | Merge branch 'master' into careminsterMelanie2013-01-041-27/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-11-17 00:48:45 +0000